next-intl 3.21.1 → 3.21.2-canary.0

package/dist/development/middleware/middleware.js

@@ -11,13 +11,15 @@ var resolveLocale = require('./resolveLocale.js');
 var syncCookie = require('./syncCookie.js');
 var utils = require('./utils.js');
 
-function createMiddleware(routing, options) {
-  var _ref, _options$alternateLin, _ref2, _options$localeDetect;
-  const resolvedRouting = config.receiveRoutingConfig(routing);
-  const resolvedOptions = {
-    alternateLinks: (_ref = (_options$alternateLin = options === null || options === void 0 ? void 0 : options.alternateLinks) !== null && _options$alternateLin !== void 0 ? _options$alternateLin : routing.alternateLinks) !== null && _ref !== void 0 ? _ref : true,
-    localeDetection: (_ref2 = (_options$localeDetect = options === null || options === void 0 ? void 0 : options.localeDetection) !== null && _options$localeDetect !== void 0 ? _options$localeDetect : routing === null || routing === void 0 ? void 0 : routing.localeDetection) !== null && _ref2 !== void 0 ? _ref2 : true
-  };
+function createMiddleware(routing, /** @deprecated Should be passed via the first parameter `routing` instead (ideally defined with `defineRouting`) */
+options) {
+  var _options$alternateLin, _options$localeDetect, _options$localeCookie;
+  const resolvedRouting = config.receiveRoutingConfig({
+    ...routing,
+    alternateLinks: (_options$alternateLin = options === null || options === void 0 ? void 0 : options.alternateLinks) !== null && _options$alternateLin !== void 0 ? _options$alternateLin : routing.alternateLinks,
+    localeDetection: (_options$localeDetect = options === null || options === void 0 ? void 0 : options.localeDetection) !== null && _options$localeDetect !== void 0 ? _options$localeDetect : routing.localeDetection,
+    localeCookie: (_options$localeCookie = options === null || options === void 0 ? void 0 : options.localeCookie) !== null && _options$localeCookie !== void 0 ? _options$localeCookie : routing.localeCookie
+  });
   return function middleware(request) {
     var _resolvedRouting$doma;
     let unsafeExternalPathname;
@@ -36,7 +38,7 @@ function createMiddleware(routing, options) {
     const {
       domain,
       locale
-    } = resolveLocale.default(resolvedRouting, resolvedOptions, request.headers, request.cookies, externalPathname);
+    } = resolveLocale.default(resolvedRouting, request.headers, request.cookies, externalPathname);
     const hasMatchedDefaultLocale = domain ? domain.defaultLocale === locale : locale === resolvedRouting.defaultLocale;
     const domainsConfig = ((_resolvedRouting$doma = resolvedRouting.domains) === null || _resolvedRouting$doma === void 0 ? void 0 : _resolvedRouting$doma.filter(curDomain => utils.isLocaleSupportedOnDomain(locale, curDomain))) || [];
     const hasUnknownHost = resolvedRouting.domains != null && !domain;
@@ -55,7 +57,7 @@ function createMiddleware(routing, options) {
     }
     function redirect(url, redirectDomain) {
       const urlObj = new URL(utils$1.normalizeTrailingSlash(url), request.url);
-      if (domainsConfig.length > 0 && !redirectDomain) {
+      if (domainsConfig.length > 0 && !redirectDomain && domain) {
         const bestMatchingDomain = utils.getBestMatchingDomain(domain, locale, domainsConfig);
         if (bestMatchingDomain) {
           redirectDomain = bestMatchingDomain.domain;
@@ -84,11 +86,12 @@ function createMiddleware(routing, options) {
     let response;
     let internalTemplateName;
     let unprefixedInternalPathname = unprefixedExternalPathname;
-    if ('pathnames' in resolvedRouting) {
+    const pathnames = resolvedRouting.pathnames;
+    if (pathnames) {
       let resolvedTemplateLocale;
-      [resolvedTemplateLocale, internalTemplateName] = utils.getInternalTemplate(resolvedRouting.pathnames, unprefixedExternalPathname, locale);
+      [resolvedTemplateLocale, internalTemplateName] = utils.getInternalTemplate(pathnames, unprefixedExternalPathname, locale);
       if (internalTemplateName) {
-        const pathnameConfig = resolvedRouting.pathnames[internalTemplateName];
+        const pathnameConfig = pathnames[internalTemplateName];
         const localeTemplate = typeof pathnameConfig === 'string' ? pathnameConfig :
         // @ts-expect-error -- This is fine
         pathnameConfig[locale];
@@ -152,14 +155,13 @@ function createMiddleware(routing, options) {
         }
       }
     }
-    if (resolvedOptions.localeDetection) {
-      syncCookie.default(request, response, locale);
+    if (resolvedRouting.localeDetection && resolvedRouting.localeCookie) {
+      syncCookie.default(request, response, locale, resolvedRouting.localeCookie);
     }
-    if (resolvedRouting.localePrefix.mode !== 'never' && resolvedOptions.alternateLinks && resolvedRouting.locales.length > 1) {
-      var _resolvedRouting$path;
+    if (resolvedRouting.localePrefix.mode !== 'never' && resolvedRouting.alternateLinks && resolvedRouting.locales.length > 1) {
       response.headers.set('Link', getAlternateLinksHeaderValue.default({
         routing: resolvedRouting,
-        localizedPathnames: internalTemplateName != null && 'pathnames' in resolvedRouting ? (_resolvedRouting$path = resolvedRouting.pathnames) === null || _resolvedRouting$path === void 0 ? void 0 : _resolvedRouting$path[internalTemplateName] : undefined,
+        localizedPathnames: internalTemplateName != null && pathnames ? pathnames === null || pathnames === void 0 ? void 0 : pathnames[internalTemplateName] : undefined,
         request,
         resolvedLocale: locale
       }));

package/dist/development/middleware/resolveLocale.js

@@ -4,7 +4,6 @@ Object.defineProperty(exports, '__esModule', { value: true });
 
 var intlLocalematcher = require('@formatjs/intl-localematcher');
 var Negotiator = require('negotiator');
-var constants = require('../shared/constants.js');
 var utils = require('./utils.js');
 
 function _interopDefault (e) { return e && e.__esModule ? e : { default: e }; }
@@ -12,11 +11,7 @@ function _interopDefault (e) { return e && e.__esModule ? e : { default: e }; }
 var Negotiator__default = /*#__PURE__*/_interopDefault(Negotiator);
 
 function findDomainFromHost(requestHeaders, domains) {
-  var _host;
-  let host = utils.getHost(requestHeaders);
-
-  // Remove port (easier for local development)
-  host = (_host = host) === null || _host === void 0 ? void 0 : _host.replace(/:\d+$/, '');
+  const host = utils.getHost(requestHeaders);
   if (host && domains) {
     return domains.find(cur => cur.domain === host);
   }
@@ -41,54 +36,46 @@ function getAcceptLanguageLocale(requestHeaders, locales, defaultLocale) {
   }
   return locale;
 }
-function getLocaleFromCookie(requestCookies, locales) {
-  if (requestCookies.has(constants.COOKIE_LOCALE_NAME)) {
+function getLocaleFromCookie(routing, requestCookies) {
+  if (routing.localeCookie && requestCookies.has(routing.localeCookie.name)) {
     var _requestCookies$get;
-    const value = (_requestCookies$get = requestCookies.get(constants.COOKIE_LOCALE_NAME)) === null || _requestCookies$get === void 0 ? void 0 : _requestCookies$get.value;
-    if (value && locales.includes(value)) {
+    const value = (_requestCookies$get = requestCookies.get(routing.localeCookie.name)) === null || _requestCookies$get === void 0 ? void 0 : _requestCookies$get.value;
+    if (value && routing.locales.includes(value)) {
       return value;
     }
   }
 }
-function resolveLocaleFromPrefix(_ref, _ref2, requestHeaders, requestCookies, pathname) {
-  let {
-    defaultLocale,
-    localePrefix,
-    locales
-  } = _ref;
-  let {
-    localeDetection
-  } = _ref2;
+function resolveLocaleFromPrefix(routing, requestHeaders, requestCookies, pathname) {
   let locale;
 
   // Prio 1: Use route prefix
   if (pathname) {
     var _getPathnameMatch;
-    locale = (_getPathnameMatch = utils.getPathnameMatch(pathname, locales, localePrefix)) === null || _getPathnameMatch === void 0 ? void 0 : _getPathnameMatch.locale;
+    locale = (_getPathnameMatch = utils.getPathnameMatch(pathname, routing.locales, routing.localePrefix)) === null || _getPathnameMatch === void 0 ? void 0 : _getPathnameMatch.locale;
   }
 
   // Prio 2: Use existing cookie
-  if (!locale && localeDetection && requestCookies) {
-    locale = getLocaleFromCookie(requestCookies, locales);
+  if (!locale && routing.localeDetection && requestCookies) {
+    locale = getLocaleFromCookie(routing, requestCookies);
   }
 
   // Prio 3: Use the `accept-language` header
-  if (!locale && localeDetection && requestHeaders) {
-    locale = getAcceptLanguageLocale(requestHeaders, locales, defaultLocale);
+  if (!locale && routing.localeDetection && requestHeaders) {
+    locale = getAcceptLanguageLocale(requestHeaders, routing.locales, routing.defaultLocale);
   }
 
   // Prio 4: Use default locale
   if (!locale) {
-    locale = defaultLocale;
+    locale = routing.defaultLocale;
   }
   return locale;
 }
-function resolveLocaleFromDomain(routing, options, requestHeaders, requestCookies, pathname) {
+function resolveLocaleFromDomain(routing, requestHeaders, requestCookies, pathname) {
   const domains = routing.domains;
   const domain = findDomainFromHost(requestHeaders, domains);
   if (!domain) {
     return {
-      locale: resolveLocaleFromPrefix(routing, options, requestHeaders, requestCookies, pathname)
+      locale: resolveLocaleFromPrefix(routing, requestHeaders, requestCookies, pathname)
     };
   }
   let locale;
@@ -111,8 +98,8 @@ function resolveLocaleFromDomain(routing, options, requestHeaders, requestCookie
   }
 
   // Prio 2: Use existing cookie
-  if (!locale && options.localeDetection && requestCookies) {
-    const cookieLocale = getLocaleFromCookie(requestCookies, routing.locales);
+  if (!locale && routing.localeDetection && requestCookies) {
+    const cookieLocale = getLocaleFromCookie(routing, requestCookies);
     if (cookieLocale) {
       if (utils.isLocaleSupportedOnDomain(cookieLocale, domain)) {
         locale = cookieLocale;
@@ -121,7 +108,7 @@ function resolveLocaleFromDomain(routing, options, requestHeaders, requestCookie
   }
 
   // Prio 3: Use the `accept-language` header
-  if (!locale && options.localeDetection && requestHeaders) {
+  if (!locale && routing.localeDetection && requestHeaders) {
     const headerLocale = getAcceptLanguageLocale(requestHeaders, domain.locales || routing.locales, domain.defaultLocale);
     if (headerLocale) {
       locale = headerLocale;
@@ -137,13 +124,12 @@ function resolveLocaleFromDomain(routing, options, requestHeaders, requestCookie
     domain
   };
 }
-function resolveLocale(routing, options, requestHeaders, requestCookies, pathname) {
+function resolveLocale(routing, requestHeaders, requestCookies, pathname) {
   if (routing.domains) {
-    const routingWithDomains = routing;
-    return resolveLocaleFromDomain(routingWithDomains, options, requestHeaders, requestCookies, pathname);
+    return resolveLocaleFromDomain(routing, requestHeaders, requestCookies, pathname);
   } else {
     return {
-      locale: resolveLocaleFromPrefix(routing, options, requestHeaders, requestCookies, pathname)
+      locale: resolveLocaleFromPrefix(routing, requestHeaders, requestCookies, pathname)
     };
   }
 }

package/dist/development/middleware/syncCookie.js

@@ -2,16 +2,17 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var constants = require('../shared/constants.js');
-
-function syncCookie(request, response, locale) {
+function syncCookie(request, response, locale, localeCookie) {
   var _request$cookies$get;
-  const hasOutdatedCookie = ((_request$cookies$get = request.cookies.get(constants.COOKIE_LOCALE_NAME)) === null || _request$cookies$get === void 0 ? void 0 : _request$cookies$get.value) !== locale;
+  const {
+    name,
+    ...rest
+  } = localeCookie;
+  const hasOutdatedCookie = ((_request$cookies$get = request.cookies.get(name)) === null || _request$cookies$get === void 0 ? void 0 : _request$cookies$get.value) !== locale;
   if (hasOutdatedCookie) {
-    response.cookies.set(constants.COOKIE_LOCALE_NAME, locale, {
+    response.cookies.set(name, locale, {
       path: request.nextUrl.basePath || undefined,
-      sameSite: constants.COOKIE_SAME_SITE,
-      maxAge: constants.COOKIE_MAX_AGE
+      ...rest
     });
   }
 }

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

@@ -6,7 +6,7 @@ var _rollupPluginBabelHelpers = require('../../_virtual/_rollupPluginBabelHelper
 var React = require('react');
 var useLocale = require('../../react-client/useLocale.js');
 var utils = require('../../shared/utils.js');
-var BaseLink = require('../shared/BaseLink.js');
+var LegacyBaseLink = require('../shared/LegacyBaseLink.js');
 
 function _interopDefault (e) { return e && e.__esModule ? e : { default: e }; }
 
@@ -21,7 +21,7 @@ function ClientLink(_ref, ref) {
   const defaultLocale = useLocale.default();
   const finalLocale = locale || defaultLocale;
   const prefix = utils.getLocalePrefix(finalLocale, localePrefix);
-  return /*#__PURE__*/React__default.default.createElement(BaseLink.default, _rollupPluginBabelHelpers.extends({
+  return /*#__PURE__*/React__default.default.createElement(LegacyBaseLink.default, _rollupPluginBabelHelpers.extends({
     ref: ref,
     locale: finalLocale,
     localePrefixMode: localePrefix.mode,

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

@@ -16,8 +16,12 @@ function _interopDefault (e) { return e && e.__esModule ? e : { default: e }; }
 
 var React__default = /*#__PURE__*/_interopDefault(React);
 
+/**
+ * @deprecated Consider switching to `createNavigation` (see https://github.com/amannn/next-intl/pull/1316)
+ **/
 function createLocalizedPathnamesNavigation(routing) {
   const config$1 = config.receiveRoutingConfig(routing);
+  const localeCookie = config.receiveLocaleCookie(routing === null || routing === void 0 ? void 0 : routing.localeCookie);
   function useTypedLocale() {
     const locale = useLocale.default();
     const isValid = config$1.locales.includes(locale);
@@ -45,6 +49,7 @@ function createLocalizedPathnamesNavigation(routing) {
         pathnames: config$1.pathnames
       }),
       locale: locale,
+      localeCookie: localeCookie,
       localePrefix: config$1.localePrefix
     }, rest));
   }
@@ -81,7 +86,7 @@ function createLocalizedPathnamesNavigation(routing) {
     }, ...args);
   }
   function useRouter() {
-    const baseRouter = useBaseRouter.default(config$1.localePrefix);
+    const baseRouter = useBaseRouter.default(config$1.localePrefix, localeCookie);
     const defaultLocale = useTypedLocale();
     return React.useMemo(() => ({
       ...baseRouter,

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

@@ -0,0 +1,83 @@
+'use strict';
+
+Object.defineProperty(exports, '__esModule', { value: true });
+
+var navigation = require('next/navigation');
+var React = require('react');
+var useLocale = require('../../react-client/useLocale.js');
+var createSharedNavigationFns = require('../shared/createSharedNavigationFns.js');
+var syncLocaleCookie = require('../shared/syncLocaleCookie.js');
+var utils = require('../shared/utils.js');
+var useBasePathname = require('./useBasePathname.js');
+
+function createNavigation(routing) {
+  function useTypedLocale() {
+    return useLocale.default();
+  }
+  const {
+    Link,
+    config,
+    getPathname,
+    ...redirects
+  } = createSharedNavigationFns.default(useTypedLocale, routing);
+
+  /** @see https://next-intl-docs.vercel.app/docs/routing/navigation#usepathname */
+  function usePathname() {
+    const pathname = useBasePathname.default(config.localePrefix);
+    const locale = useTypedLocale();
+
+    // @ts-expect-error -- Mirror the behavior from Next.js, where `null` is returned when `usePathname` is used outside of Next, but the types indicate that a string is always returned.
+    return React.useMemo(() => pathname &&
+    // @ts-expect-error -- This is fine
+    config.pathnames ? utils.getRoute(locale, pathname,
+    // @ts-expect-error -- This is fine
+    config.pathnames) : pathname, [locale, pathname]);
+  }
+  function useRouter() {
+    const router = navigation.useRouter();
+    const curLocale = useTypedLocale();
+    const nextPathname = navigation.usePathname();
+    return React.useMemo(() => {
+      function createHandler(fn) {
+        return function handler(href, options) {
+          const {
+            locale: nextLocale,
+            ...rest
+          } = options || {};
+
+          // @ts-expect-error -- We're passing a domain here just in case
+          const pathname = getPathname({
+            href,
+            locale: nextLocale || curLocale,
+            domain: window.location.host
+          });
+          const args = [pathname];
+          if (Object.keys(rest).length > 0) {
+            // @ts-expect-error -- This is fine
+            args.push(rest);
+          }
+          fn(...args);
+          syncLocaleCookie.default(config.localeCookie, nextPathname, curLocale, nextLocale);
+        };
+      }
+      return {
+        ...router,
+        /** @see https://next-intl-docs.vercel.app/docs/routing/navigation#userouter */
+        push: createHandler(router.push),
+        /** @see https://next-intl-docs.vercel.app/docs/routing/navigation#userouter */
+        replace: createHandler(router.replace),
+        /** @see https://next-intl-docs.vercel.app/docs/routing/navigation#userouter */
+        prefetch: createHandler(router.prefetch)
+      };
+    }, [curLocale, nextPathname, router]);
+  }
+  return {
+    ...redirects,
+    Link,
+    usePathname,
+    useRouter,
+    getPathname
+  };
+}
+
+exports.default = createNavigation;

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

@@ -14,11 +14,16 @@ function _interopDefault (e) { return e && e.__esModule ? e : { default: e }; }
 
 var React__default = /*#__PURE__*/_interopDefault(React);
 
+/**
+ * @deprecated Consider switching to `createNavigation` (see https://github.com/amannn/next-intl/pull/1316)
+ **/
 function createSharedPathnamesNavigation(routing) {
   const localePrefix = config.receiveLocalePrefixConfig(routing === null || routing === void 0 ? void 0 : routing.localePrefix);
+  const localeCookie = config.receiveLocaleCookie(routing === null || routing === void 0 ? void 0 : routing.localeCookie);
   function Link(props, ref) {
     return /*#__PURE__*/React__default.default.createElement(ClientLink.default, _rollupPluginBabelHelpers.extends({
       ref: ref,
+      localeCookie: localeCookie,
       localePrefix: localePrefix
     }, props));
   }
@@ -48,7 +53,7 @@ function createSharedPathnamesNavigation(routing) {
     return result;
   }
   function useRouter() {
-    return useBaseRouter.default(localePrefix);
+    return useBaseRouter.default(localePrefix, localeCookie);
   }
   return {
     Link: LinkWithRef,

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

@@ -1,4 +1,3 @@
-"use client";
 'use strict';
 
 Object.defineProperty(exports, '__esModule', { value: true });
@@ -8,19 +7,6 @@ var React = require('react');
 var useLocale = require('../../react-client/useLocale.js');
 var utils = require('../../shared/utils.js');
 
-/**
- * Returns the pathname without a potential locale prefix.
- *
- * @example
- * ```tsx
- * 'use client';
- *
- * import {usePathname} from 'next-intl/client';
- *
- * // When the user is on `/en`, this will be `/`
- * const pathname = usePathname();
- * ```
- */
 function useBasePathname(localePrefix) {
   // The types aren't entirely correct here. Outside of Next.js
   // `useParams` can be called, but the return type is `null`.

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

@@ -28,7 +28,7 @@ var utils = require('../shared/utils.js');
  * router.push('/about', {locale: 'de'});
  * ```
  */
-function useBaseRouter(localePrefix) {
+function useBaseRouter(localePrefix, localeCookie) {
   const router = navigation.useRouter();
   const locale = useLocale.default();
   const pathname = navigation.usePathname();
@@ -50,7 +50,7 @@ function useBaseRouter(localePrefix) {
           locale: nextLocale,
           ...rest
         } = options || {};
-        syncLocaleCookie.default(pathname, locale, nextLocale);
+        syncLocaleCookie.default(localeCookie, pathname, locale, nextLocale);
         const args = [localize(href, nextLocale)];
         if (Object.keys(rest).length > 0) {
           args.push(rest);
@@ -66,7 +66,7 @@ function useBaseRouter(localePrefix) {
       replace: createHandler(router.replace),
       prefetch: createHandler(router.prefetch)
     };
-  }, [locale, localePrefix, pathname, router]);
+  }, [locale, localeCookie, localePrefix, pathname, router]);
 }
 
 exports.default = useBaseRouter;

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

@@ -5,13 +5,15 @@ Object.defineProperty(exports, '__esModule', { value: true });
 var _rollupPluginBabelHelpers = require('../../_virtual/_rollupPluginBabelHelpers.js');
 var React = require('react');
 var utils = require('../../shared/utils.js');
-var BaseLink = require('../shared/BaseLink.js');
+var LegacyBaseLink = require('../shared/LegacyBaseLink.js');
 var getLocale = require('../../server/react-server/getLocale.js');
 
 function _interopDefault (e) { return e && e.__esModule ? e : { default: e }; }
 
 var React__default = /*#__PURE__*/_interopDefault(React);
 
+// Only used by legacy navigation APIs, can be removed when they are removed
+
 async function ServerLink(_ref) {
   let {
     locale,
@@ -20,7 +22,7 @@ async function ServerLink(_ref) {
   } = _ref;
   const finalLocale = locale || (await getLocale.default());
   const prefix = utils.getLocalePrefix(finalLocale, localePrefix);
-  return /*#__PURE__*/React__default.default.createElement(BaseLink.default, _rollupPluginBabelHelpers.extends({
+  return /*#__PURE__*/React__default.default.createElement(LegacyBaseLink.default, _rollupPluginBabelHelpers.extends({
     locale: finalLocale,
     localePrefixMode: localePrefix.mode,
     prefix: prefix

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

@@ -5,7 +5,7 @@ Object.defineProperty(exports, '__esModule', { value: true });
 var _rollupPluginBabelHelpers = require('../../_virtual/_rollupPluginBabelHelpers.js');
 var React = require('react');
 var config = require('../../routing/config.js');
-var RequestLocale = require('../../server/react-server/RequestLocale.js');
+var RequestLocaleLegacy = require('../../server/react-server/RequestLocaleLegacy.js');
 var utils = require('../shared/utils.js');
 var ServerLink = require('./ServerLink.js');
 var redirects = require('./redirects.js');
@@ -22,7 +22,7 @@ function createLocalizedPathnamesNavigation(routing) {
       locale,
       ...rest
     } = _ref;
-    const defaultLocale = RequestLocale.getRequestLocale();
+    const defaultLocale = RequestLocaleLegacy.getRequestLocale();
     const finalLocale = locale || defaultLocale;
     return /*#__PURE__*/React__default.default.createElement(ServerLink.default, _rollupPluginBabelHelpers.extends({
       href: utils.compileLocalizedPathname({
@@ -34,11 +34,12 @@ function createLocalizedPathnamesNavigation(routing) {
         pathnames: config$1.pathnames
       }),
       locale: locale,
+      localeCookie: config$1.localeCookie,
       localePrefix: config$1.localePrefix
     }, rest));
   }
   function redirect(href) {
-    const locale = RequestLocale.getRequestLocale();
+    const locale = RequestLocaleLegacy.getRequestLocale();
     const pathname = getPathname({
       href,
       locale
@@ -52,7 +53,7 @@ function createLocalizedPathnamesNavigation(routing) {
     }, ...args);
   }
   function permanentRedirect(href) {
-    const locale = RequestLocale.getRequestLocale();
+    const locale = RequestLocaleLegacy.getRequestLocale();
     const pathname = getPathname({
       href,
       locale

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

@@ -0,0 +1,30 @@
+'use strict';
+
+Object.defineProperty(exports, '__esModule', { value: true });
+
+var RequestLocale = require('../../server/react-server/RequestLocale.js');
+var createSharedNavigationFns = require('../shared/createSharedNavigationFns.js');
+
+function createNavigation(routing) {
+  function getLocale() {
+    return RequestLocale.getRequestLocale();
+  }
+
+  // eslint-disable-next-line @typescript-eslint/no-unused-vars
+  const {
+    config,
+    ...fns
+  } = createSharedNavigationFns.default(getLocale, routing);
+  function notSupported(hookName) {
+    return () => {
+      throw new Error("`".concat(hookName, "` is not supported in Server Components. You can use this hook if you convert the calling component to a Client Component."));
+    };
+  }
+  return {
+    ...fns,
+    usePathname: notSupported('usePathname'),
+    useRouter: notSupported('useRouter')
+  };
+}
+
+exports.default = createNavigation;

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

@@ -14,6 +14,7 @@ var React__default = /*#__PURE__*/_interopDefault(React);
 
 function createSharedPathnamesNavigation(routing) {
   const localePrefix = config.receiveLocalePrefixConfig(routing === null || routing === void 0 ? void 0 : routing.localePrefix);
+  const localeCookie = config.receiveLocaleCookie(routing === null || routing === void 0 ? void 0 : routing.localeCookie);
   function notSupported(hookName) {
     return () => {
       throw new Error("`".concat(hookName, "` is not supported in Server Components. You can use this hook if you convert the component to a Client Component."));
@@ -21,6 +22,7 @@ function createSharedPathnamesNavigation(routing) {
   }
   function Link(props) {
     return /*#__PURE__*/React__default.default.createElement(ServerLink.default, _rollupPluginBabelHelpers.extends({
+      localeCookie: localeCookie,
       localePrefix: localePrefix
     }, props));
   }

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

@@ -2,12 +2,12 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var RequestLocale = require('../../server/react-server/RequestLocale.js');
+var RequestLocaleLegacy = require('../../server/react-server/RequestLocaleLegacy.js');
 var redirects = require('../shared/redirects.js');
 
 function createRedirectFn(redirectFn) {
   return function serverRedirect(params) {
-    const locale = RequestLocale.getRequestLocale();
+    const locale = RequestLocaleLegacy.getRequestLocale();
     for (var _len = arguments.length, args = new Array(_len > 1 ? _len - 1 : 0), _key = 1; _key < _len; _key++) {
       args[_key - 1] = arguments[_key];
     }

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

@@ -8,7 +8,6 @@ var NextLink = require('next/link');
 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 }; }
@@ -18,39 +17,38 @@ var React__default = /*#__PURE__*/_interopDefault(React);
 
 function BaseLink(_ref, ref) {
   let {
+    defaultLocale,
     href,
     locale,
-    localePrefixMode,
+    localeCookie,
     onClick,
     prefetch,
-    prefix,
+    unprefixed,
     ...rest
   } = _ref;
+  const curLocale = useLocale.default();
+  const isChangingLocale = locale !== curLocale;
+  const linkLocale = locale || curLocale;
+  const host = useHost();
+  const finalHref =
+  // Only after hydration (to avoid mismatches)
+  host &&
+  // If there is an `unprefixed` prop, the
+  // `defaultLocale` might differ by domain
+  unprefixed && (
+  // Unprefix the pathname if a domain matches
+  unprefixed.domains[host] === linkLocale ||
+  // … and handle unknown domains by applying the
+  // global `defaultLocale` (e.g. on localhost)
+  !Object.keys(unprefixed.domains).includes(host) && curLocale === defaultLocale && !locale) ? unprefixed.pathname : href;
+
   // The types aren't entirely correct here. Outside of Next.js
   // `useParams` can be called, but the return type is `null`.
   const pathname = navigation.usePathname();
-  const curLocale = useLocale.default();
-  const isChangingLocale = locale !== curLocale;
-  const [localizedHref, setLocalizedHref] = React.useState(() => utils.isLocalizableHref(href) && (localePrefixMode !== 'never' || isChangingLocale) ?
-  // For the `localePrefix: 'as-needed' strategy, the href shouldn't
-  // be prefixed if the locale is the default locale. To determine this, we
-  // need a) the default locale and b) the information if we use prefixed
-  // routing. The default locale can vary by domain, therefore during the
-  // RSC as well as the SSR render, we can't determine the default locale
-  // statically. Therefore we always prefix the href since this will
-  // always result in a valid URL, even if it might cause a redirect. This
-  // is better than pointing to a non-localized href during the server
-  // render, which would potentially be wrong. The final href is
-  // determined in the effect below.
-  utils.prefixHref(href, prefix) : href);
   function onLinkClick(event) {
-    syncLocaleCookie.default(pathname, curLocale, locale);
+    syncLocaleCookie.default(localeCookie, pathname, curLocale, locale);
     if (onClick) onClick(event);
   }
-  React.useEffect(() => {
-    if (!pathname) return;
-    setLocalizedHref(utils.localizeHref(href, locale, curLocale, pathname, prefix));
-  }, [curLocale, href, locale, pathname, prefix]);
   if (isChangingLocale) {
     if (prefetch && "development" !== 'production') {
       console.error('The `prefetch` prop is currently not supported when using the `locale` prop on `Link` to switch the locale.`');
@@ -59,13 +57,19 @@ function BaseLink(_ref, ref) {
   }
   return /*#__PURE__*/React__default.default.createElement(NextLink__default.default, _rollupPluginBabelHelpers.extends({
     ref: ref,
-    href: localizedHref,
+    href: finalHref,
     hrefLang: isChangingLocale ? locale : undefined,
     onClick: onLinkClick,
     prefetch: prefetch
   }, rest));
 }
-const BaseLinkWithRef = /*#__PURE__*/React.forwardRef(BaseLink);
-BaseLinkWithRef.displayName = 'ClientLink';
+function useHost() {
+  const [host, setHost] = React.useState();
+  React.useEffect(() => {
+    setHost(window.location.host);
+  }, []);
+  return host;
+}
+var BaseLink$1 = /*#__PURE__*/React.forwardRef(BaseLink);
 
-exports.default = BaseLinkWithRef;
+exports.default = BaseLink$1;