next-intl 3.0.0-rc.9 → 3.0.0

package/README.md

@@ -51,7 +51,7 @@ export default function UserProfile({user}) {
 }
 ```
 
-```json
+```js
 // en.json
 {
   "UserProfile": {

package/dist/development/navigation/BaseLink.js

@@ -17,9 +17,11 @@ function BaseLink(_ref, ref) {
     ...rest
   } = _ref;
   const defaultLocale = useLocale.default();
+  const linkLocale = locale || defaultLocale;
   return /*#__PURE__*/React__default.default.createElement(BaseLinkWithLocale.default, _rollupPluginBabelHelpers.extends({
     ref: ref,
-    locale: locale || defaultLocale
+    hrefLang: linkLocale,
+    locale: linkLocale
   }, rest));
 }
 

package/dist/development/navigation/utils.js

@@ -44,7 +44,8 @@ function compileLocalizedPathname(_ref) {
     return namedPath;
   }
   function compilePath(namedPath) {
-    let compiled = typeof namedPath === 'string' ? namedPath : namedPath[locale];
+    const template = typeof namedPath === 'string' ? namedPath : namedPath[locale];
+    let compiled = template;
     if (params) {
       Object.entries(params).forEach(_ref2 => {
         let [key, value] = _ref2;
@@ -55,6 +56,10 @@ function compileLocalizedPathname(_ref) {
         }
       });
     }
+    if (compiled.includes('[')) {
+      // Next.js throws anyway, therefore better provide a more helpful error message
+      throw new Error("Insufficient params provided for localized pathname.\nTemplate: ".concat(template, "\nParams: ").concat(JSON.stringify(params)));
+    }
     if (query) {
       compiled += serializeSearchParams(query);
     }

package/dist/development/react-server/useHook.js

@@ -9,7 +9,7 @@ function useHook(hookName, promise) {
     return React.use(promise);
   } catch (error) {
     if (error instanceof TypeError && error.message.includes("Cannot read properties of null (reading 'use')")) {
-      throw new Error("`".concat(hookName, "` is not callable within an async component. Please refer to https://next-intl-docs-git-feat-next-13-rsc-next-intl.vercel.app/docs/environments/server-client-components#async-components"), {
+      throw new Error("`".concat(hookName, "` is not callable within an async component. Please refer to https://next-intl-docs.vercel.app/docs/environments/server-client-components#async-components"), {
         cause: error
       });
     } else {

package/dist/development/server/getFormatter.js

@@ -19,7 +19,7 @@ const getFormatterImpl = React.cache(async locale => {
  * you can override it by passing in additional options.
  */
 async function getFormatter(opts) {
-  const locale = await resolveLocaleArg.default('getFormatter', opts);
+  const locale = await resolveLocaleArg.default(opts);
   return getFormatterImpl(locale);
 }
 

package/dist/development/server/getMessages.js

@@ -14,7 +14,7 @@ const getMessagesImpl = React.cache(async locale => {
   return config.messages;
 });
 async function getMessages(opts) {
-  const locale = await resolveLocaleArg.default('getMessages', opts);
+  const locale = await resolveLocaleArg.default(opts);
   return getMessagesImpl(locale);
 }
 

package/dist/development/server/getNow.js

@@ -11,7 +11,7 @@ const getNowImpl = React.cache(async locale => {
   return config.now;
 });
 async function getNow(opts) {
-  const locale = await resolveLocaleArg.default('getNow', opts);
+  const locale = await resolveLocaleArg.default(opts);
   return getNowImpl(locale);
 }
 

package/dist/development/server/getTimeZone.js

@@ -11,7 +11,7 @@ const getTimeZoneImpl = React.cache(async locale => {
   return config.timeZone;
 });
 async function getTimeZone(opts) {
-  const locale = await resolveLocaleArg.default('getTimeZone', opts);
+  const locale = await resolveLocaleArg.default(opts);
   return getTimeZoneImpl(locale);
 }
 

package/dist/development/server/resolveLocaleArg.js

@@ -2,23 +2,14 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var React = require('react');
 var getLocale = require('./getLocale.js');
 
-// TODO: Remove
-
-const deprecate = React.cache((fnName, locale) => {
-  console.error("\nDEPRECATION WARNING: Passing a locale as a string to `".concat(fnName, "` has been deprecated in favor of passing an object with a `locale` property instead:\n\n").concat(fnName, "({locale: '").concat(locale, "'});\n\nSee https://github.com/amannn/next-intl/pull/600\n"));
-});
-function resolveLocaleArg(fnName, optsOrDeprecatedLocale) {
-  if (typeof optsOrDeprecatedLocale === 'string') {
-    deprecate(fnName, optsOrDeprecatedLocale);
-    return optsOrDeprecatedLocale;
-  }
-  if (optsOrDeprecatedLocale !== null && optsOrDeprecatedLocale !== void 0 && optsOrDeprecatedLocale.locale) {
-    return optsOrDeprecatedLocale.locale;
+function resolveLocaleArg(opts) {
+  if (opts !== null && opts !== void 0 && opts.locale) {
+    return Promise.resolve(opts.locale);
+  } else {
+    return getLocale.default();
   }
-  return getLocale.default();
 }
 
 exports.default = resolveLocaleArg;

package/dist/development/server.js

@@ -2,16 +2,22 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var index = require('./server/react-client/index.js');
+var getRequestConfig = require('./server/getRequestConfig.js');
+var getFormatter = require('./server/getFormatter.js');
+var getNow = require('./server/getNow.js');
+var getTimeZone = require('./server/getTimeZone.js');
+var getTranslations = require('./server/getTranslations.js');
+var getMessages = require('./server/getMessages.js');
+var getLocale = require('./server/getLocale.js');
+var RequestLocale = require('./server/RequestLocale.js');
 
 
 
-exports.getFormatter = index.getFormatter;
-exports.getLocale = index.getLocale;
-exports.getMessages = index.getMessages;
-exports.getNow = index.getNow;
-exports.getRequestConfig = index.getRequestConfig;
-exports.getTimeZone = index.getTimeZone;
-exports.getTranslations = index.getTranslations;
-exports.getTranslator = index.getTranslator;
-exports.unstable_setRequestLocale = index.unstable_setRequestLocale;
+exports.getRequestConfig = getRequestConfig.default;
+exports.getFormatter = getFormatter.default;
+exports.getNow = getNow.default;
+exports.getTimeZone = getTimeZone.default;
+exports.getTranslations = getTranslations.default;
+exports.getMessages = getMessages.default;
+exports.getLocale = getLocale.default;
+exports.unstable_setRequestLocale = RequestLocale.setRequestLocale;

package/dist/esm/navigation/BaseLink.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/BaseLinkWithLocale.js";function o(t,o){let{locale:s,...i}=t;const c=a();return r.createElement(l,e({ref:o,locale:s||c},i))}const s=t(o);s.displayName="Link";var i=s;export{i as default};
+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/BaseLinkWithLocale.js";function o(t,o){let{locale:s,...i}=t;const n=a(),c=s||n;return r.createElement(l,e({ref:o,hrefLang:c,locale:c},i))}const s=t(o);s.displayName="Link";var i=s;export{i as default};

package/dist/esm/navigation/utils.js

@@ -1 +1 @@
-import{unlocalizePathname as t,matchesPathname as n}from"../shared/utils.js";function e(t){return"string"==typeof t?{pathname:t}:t}function r(t){function n(t){return String(t)}const e=new URLSearchParams;for(const[r,a]of Object.entries(t))Array.isArray(a)?a.forEach((t=>{e.append(r,n(t))})):e.set(r,n(a));return"?"+e.toString()}function a(t){let{pathname:n,locale:e,params:a,pathnames:o,query:i}=t;function c(t){let n=o[t];return n||(n=t),n}function s(t){let n="string"==typeof t?t:t[e];return a&&Object.entries(a).forEach((t=>{let[e,r]=t;n=Array.isArray(r)?n.replace(new RegExp("(\\[)?\\[...".concat(e,"\\](\\])?"),"g"),r.map((t=>String(t))).join("/")):n.replace("[".concat(e,"]"),String(r))})),i&&(n+=r(i)),n}if("string"==typeof n){return s(c(n))}{const{pathname:t,...e}=n;return{...e,pathname:s(c(t))}}}function o(e){var r;let{locale:a,pathname:o,pathnames:i}=e;const c=t(o,a);let s=null===(r=Object.entries(i).find((t=>{let[,e]=t;const r="string"!=typeof e?e[a]:e;return n(r,c)})))||void 0===r?void 0:r[0];return s||(s=o),s}export{a as compileLocalizedPathname,o as getRoute,e as normalizeNameOrNameWithParams,r as serializeSearchParams};
+import{unlocalizePathname as t,matchesPathname as n}from"../shared/utils.js";function r(t){return"string"==typeof t?{pathname:t}:t}function e(t){function n(t){return String(t)}const r=new URLSearchParams;for(const[e,a]of Object.entries(t))Array.isArray(a)?a.forEach((t=>{r.append(e,n(t))})):r.set(e,n(a));return"?"+r.toString()}function a(t){let{pathname:n,locale:r,params:a,pathnames:o,query:i}=t;function c(t){let n=o[t];return n||(n=t),n}function s(t){const n="string"==typeof t?t:t[r];let o=n;if(a&&Object.entries(a).forEach((t=>{let[n,r]=t;o=Array.isArray(r)?o.replace(new RegExp("(\\[)?\\[...".concat(n,"\\](\\])?"),"g"),r.map((t=>String(t))).join("/")):o.replace("[".concat(n,"]"),String(r))})),o.includes("["))throw new Error("Insufficient params provided for localized pathname.\nTemplate: ".concat(n,"\nParams: ").concat(JSON.stringify(a)));return i&&(o+=e(i)),o}if("string"==typeof n){return s(c(n))}{const{pathname:t,...r}=n;return{...r,pathname:s(c(t))}}}function o(r){var e;let{locale:a,pathname:o,pathnames:i}=r;const c=t(o,a);let s=null===(e=Object.entries(i).find((t=>{let[,r]=t;const e="string"!=typeof r?r[a]:r;return n(e,c)})))||void 0===e?void 0:e[0];return s||(s=o),s}export{a as compileLocalizedPathname,o as getRoute,r as normalizeNameOrNameWithParams,e as serializeSearchParams};

package/dist/esm/react-server/useHook.js

@@ -1 +1 @@
-import{use as e}from"react";function n(n,t){try{return e(t)}catch(e){throw e instanceof TypeError&&e.message.includes("Cannot read properties of null (reading 'use')")?new Error("`".concat(n,"` is not callable within an async component. Please refer to https://next-intl-docs-git-feat-next-13-rsc-next-intl.vercel.app/docs/environments/server-client-components#async-components"),{cause:e}):e}}export{n as default};
+import{use as e}from"react";function n(n,t){try{return e(t)}catch(e){throw e instanceof TypeError&&e.message.includes("Cannot read properties of null (reading 'use')")?new Error("`".concat(n,"` is not callable within an async component. Please refer to https://next-intl-docs.vercel.app/docs/environments/server-client-components#async-components"),{cause:e}):e}}export{n as default};

package/dist/esm/server/getFormatter.js

@@ -1 +1 @@
-import{cache as t}from"react";import{createFormatter as r}from"use-intl/core";import o from"./getConfig.js";import e from"./resolveLocaleArg.js";const a=t((async t=>{const e=await o(t);return r(e)}));async function n(t){const r=await e("getFormatter",t);return a(r)}export{n as default};
+import{cache as o}from"react";import{createFormatter as r}from"use-intl/core";import t from"./getConfig.js";import e from"./resolveLocaleArg.js";const n=o((async o=>{const e=await t(o);return r(e)}));async function a(o){const r=await e(o);return n(r)}export{a as default};

package/dist/esm/server/getMessages.js

@@ -1 +1 @@
-import{cache as e}from"react";import s from"./getConfig.js";import o from"./resolveLocaleArg.js";const t=e((async e=>{const o=await s(e);if(!o.messages)throw new Error("No messages found. Have you configured them correctly? See https://next-intl-docs.vercel.app/docs/configuration#messages");return o.messages}));async function r(e){const s=await o("getMessages",e);return t(s)}export{r as default};
+import{cache as e}from"react";import o from"./getConfig.js";import s from"./resolveLocaleArg.js";const r=e((async e=>{const s=await o(e);if(!s.messages)throw new Error("No messages found. Have you configured them correctly? See https://next-intl-docs.vercel.app/docs/configuration#messages");return s.messages}));async function t(e){const o=await s(e);return r(o)}export{t as default};

package/dist/esm/server/getNow.js

@@ -1 +1 @@
-import{cache as o}from"react";import t from"./getConfig.js";import r from"./resolveLocaleArg.js";const a=o((async o=>(await t(o)).now));async function e(o){const t=await r("getNow",o);return a(t)}export{e as default};
+import{cache as o}from"react";import t from"./getConfig.js";import r from"./resolveLocaleArg.js";const a=o((async o=>(await t(o)).now));async function n(o){const t=await r(o);return a(t)}export{n as default};

package/dist/esm/server/getTimeZone.js

@@ -1 +1 @@
-import{cache as o}from"react";import t from"./getConfig.js";import e from"./resolveLocaleArg.js";const r=o((async o=>(await t(o)).timeZone));async function a(o){const t=await e("getTimeZone",o);return r(t)}export{a as default};
+import{cache as o}from"react";import t from"./getConfig.js";import r from"./resolveLocaleArg.js";const a=o((async o=>(await t(o)).timeZone));async function e(o){const t=await r(o);return a(t)}export{e as default};

package/dist/esm/server/resolveLocaleArg.js

@@ -1 +1 @@
-import{cache as n}from"react";import o from"./getLocale.js";const t=n(((n,o)=>{console.error("\nDEPRECATION WARNING: Passing a locale as a string to `".concat(n,"` has been deprecated in favor of passing an object with a `locale` property instead:\n\n").concat(n,"({locale: '").concat(o,"'});\n\nSee https://github.com/amannn/next-intl/pull/600\n"))}));function a(n,a){return"string"==typeof a?(t(n,a),a):null!=a&&a.locale?a.locale:o()}export{a as default};
+import e from"./getLocale.js";function l(l){return null!=l&&l.locale?Promise.resolve(l.locale):e()}export{l as default};

package/dist/esm/server.js

@@ -1 +1 @@
-export{getFormatter,getLocale,getMessages,getNow,getRequestConfig,getTimeZone,getTranslations,getTranslator,unstable_setRequestLocale}from"./server/react-client/index.js";
+export{default as getRequestConfig}from"./server/getRequestConfig.js";export{default as getFormatter}from"./server/getFormatter.js";export{default as getNow}from"./server/getNow.js";export{default as getTimeZone}from"./server/getTimeZone.js";export{default as getTranslations}from"./server/getTranslations.js";export{default as getMessages}from"./server/getMessages.js";export{default as getLocale}from"./server/getLocale.js";export{setRequestLocale as unstable_setRequestLocale}from"./server/RequestLocale.js";

package/dist/production/navigation/BaseLink.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/BaseLinkWithLocale.js");function a(e){return e&&e.__esModule?e:{default:e}}var u=a(r);function s(r,a){let{locale:s,...i}=r;const n=t.default();return u.default.createElement(l.default,e.extends({ref:a,locale:s||n},i))}const i=r.forwardRef(s);i.displayName="Link";var n=i;exports.default=n;
+"use strict";Object.defineProperty(exports,"__esModule",{value:!0});var e=require("../_virtual/_rollupPluginBabelHelpers.js"),r=require("react"),t=require("../react-client/useLocale.js"),a=require("../shared/BaseLinkWithLocale.js");function l(e){return e&&e.__esModule?e:{default:e}}var u=l(r);function s(r,l){let{locale:s,...n}=r;const i=t.default(),o=s||i;return u.default.createElement(a.default,e.extends({ref:l,hrefLang:o,locale:o},n))}const n=r.forwardRef(s);n.displayName="Link";var i=n;exports.default=i;

package/dist/production/react-server/useHook.js

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,"__esModule",{value:!0});var e=require("react");exports.default=function(t,n){try{return e.use(n)}catch(e){throw e instanceof TypeError&&e.message.includes("Cannot read properties of null (reading 'use')")?new Error("`".concat(t,"` is not callable within an async component. Please refer to https://next-intl-docs-git-feat-next-13-rsc-next-intl.vercel.app/docs/environments/server-client-components#async-components"),{cause:e}):e}};
+"use strict";Object.defineProperty(exports,"__esModule",{value:!0});var e=require("react");exports.default=function(n,r){try{return e.use(r)}catch(e){throw e instanceof TypeError&&e.message.includes("Cannot read properties of null (reading 'use')")?new Error("`".concat(n,"` is not callable within an async component. Please refer to https://next-intl-docs.vercel.app/docs/environments/server-client-components#async-components"),{cause:e}):e}};

package/dist/production/server/getFormatter.js

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,"__esModule",{value:!0});var e=require("react"),r=require("use-intl/core"),t=require("./getConfig.js"),a=require("./resolveLocaleArg.js");const c=e.cache((async e=>{const a=await t.default(e);return r.createFormatter(a)}));exports.default=async function(e){const r=await a.default("getFormatter",e);return c(r)};
+"use strict";Object.defineProperty(exports,"__esModule",{value:!0});var e=require("react"),r=require("use-intl/core"),t=require("./getConfig.js"),a=require("./resolveLocaleArg.js");const c=e.cache((async e=>{const a=await t.default(e);return r.createFormatter(a)}));exports.default=async function(e){const r=await a.default(e);return c(r)};

package/dist/production/server/getMessages.js

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,"__esModule",{value:!0});var e=require("react"),s=require("./getConfig.js"),r=require("./resolveLocaleArg.js");const t=e.cache((async e=>{const r=await s.default(e);if(!r.messages)throw new Error("No messages found. Have you configured them correctly? See https://next-intl-docs.vercel.app/docs/configuration#messages");return r.messages}));exports.default=async function(e){const s=await r.default("getMessages",e);return t(s)};
+"use strict";Object.defineProperty(exports,"__esModule",{value:!0});var e=require("react"),r=require("./getConfig.js"),s=require("./resolveLocaleArg.js");const t=e.cache((async e=>{const s=await r.default(e);if(!s.messages)throw new Error("No messages found. Have you configured them correctly? See https://next-intl-docs.vercel.app/docs/configuration#messages");return s.messages}));exports.default=async function(e){const r=await s.default(e);return t(r)};

package/dist/production/server/getNow.js

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,"__esModule",{value:!0});var e=require("react"),t=require("./getConfig.js"),r=require("./resolveLocaleArg.js");const a=e.cache((async e=>(await t.default(e)).now));exports.default=async function(e){const t=await r.default("getNow",e);return a(t)};
+"use strict";Object.defineProperty(exports,"__esModule",{value:!0});var e=require("react"),r=require("./getConfig.js"),t=require("./resolveLocaleArg.js");const a=e.cache((async e=>(await r.default(e)).now));exports.default=async function(e){const r=await t.default(e);return a(r)};

package/dist/production/server/getTimeZone.js

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,"__esModule",{value:!0});var e=require("react"),t=require("./getConfig.js"),r=require("./resolveLocaleArg.js");const a=e.cache((async e=>(await t.default(e)).timeZone));exports.default=async function(e){const t=await r.default("getTimeZone",e);return a(t)};
+"use strict";Object.defineProperty(exports,"__esModule",{value:!0});var e=require("react"),t=require("./getConfig.js"),r=require("./resolveLocaleArg.js");const a=e.cache((async e=>(await t.default(e)).timeZone));exports.default=async function(e){const t=await r.default(e);return a(t)};

package/dist/production/server/resolveLocaleArg.js

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,"__esModule",{value:!0});var e=require("react"),t=require("./getLocale.js");const n=e.cache(((e,t)=>{console.error("\nDEPRECATION WARNING: Passing a locale as a string to `".concat(e,"` has been deprecated in favor of passing an object with a `locale` property instead:\n\n").concat(e,"({locale: '").concat(t,"'});\n\nSee https://github.com/amannn/next-intl/pull/600\n"))}));exports.default=function(e,a){return"string"==typeof a?(n(e,a),a):null!=a&&a.locale?a.locale:t.default()};
+"use strict";Object.defineProperty(exports,"__esModule",{value:!0});var e=require("./getLocale.js");exports.default=function(l){return null!=l&&l.locale?Promise.resolve(l.locale):e.default()};

package/dist/production/server.js

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,"__esModule",{value:!0});var e=require("./server/react-client/index.js");exports.getFormatter=e.getFormatter,exports.getLocale=e.getLocale,exports.getMessages=e.getMessages,exports.getNow=e.getNow,exports.getRequestConfig=e.getRequestConfig,exports.getTimeZone=e.getTimeZone,exports.getTranslations=e.getTranslations,exports.getTranslator=e.getTranslator,exports.unstable_setRequestLocale=e.unstable_setRequestLocale;
+"use strict";Object.defineProperty(exports,"__esModule",{value:!0});var e=require("./server/getRequestConfig.js"),r=require("./server/getFormatter.js"),t=require("./server/getNow.js"),s=require("./server/getTimeZone.js"),o=require("./server/getTranslations.js"),u=require("./server/getMessages.js"),a=require("./server/getLocale.js"),g=require("./server/RequestLocale.js");exports.getRequestConfig=e.default,exports.getFormatter=r.default,exports.getNow=t.default,exports.getTimeZone=s.default,exports.getTranslations=o.default,exports.getMessages=u.default,exports.getLocale=a.default,exports.unstable_setRequestLocale=g.setRequestLocale;

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

@@ -1,2 +1,3 @@
 export { default as createSharedPathnamesNavigation } from './createSharedPathnamesNavigation';
 export { default as createLocalizedPathnamesNavigation } from './createLocalizedPathnamesNavigation';
+export type { Pathnames } from '../../shared/types';

package/dist/types/src/server/getFormatter.d.ts

@@ -6,7 +6,7 @@
  */
 export default function getFormatter(opts?: {
     locale?: string;
-} | string): Promise<{
+}): Promise<{
     dateTime: (value: number | Date, formatOrOptions?: string | import("use-intl/dist/types/src/core/DateTimeFormatOptions").default | undefined) => string;
     number: (value: number | bigint, formatOrOptions?: string | import("use-intl/core").NumberFormatOptions | undefined) => string;
     relativeTime: (date: number | Date, nowOrOptions?: number | Date | import("use-intl/dist/types/src/core/RelativeTimeFormatOptions").default | undefined) => string;

package/dist/types/src/server/getMessages.d.ts

@@ -1,3 +1,3 @@
 export default function getMessages(opts?: {
     locale?: string;
-} | string): Promise<import("use-intl/dist/types/src/core/AbstractIntlMessages").default>;
+}): Promise<import("use-intl/dist/types/src/core/AbstractIntlMessages").default>;

package/dist/types/src/server/getNow.d.ts

@@ -1,3 +1,3 @@
 export default function getNow(opts?: {
     locale?: string;
-} | string): Promise<Date>;
+}): Promise<Date>;

package/dist/types/src/server/getTimeZone.d.ts

@@ -1,3 +1,3 @@
 export default function getTimeZone(opts?: {
     locale?: string;
-} | string): Promise<string>;
+}): Promise<string>;

package/dist/types/src/server/index.d.ts

@@ -9,4 +9,3 @@ export { default as getTranslations } from './getTranslations';
 export { default as getMessages } from './getMessages';
 export { default as getLocale } from './getLocale';
 export { setRequestLocale as unstable_setRequestLocale } from './RequestLocale';
-export { default as getTranslator } from './getTranslator';

package/dist/types/src/server/resolveLocaleArg.d.ts

@@ -1,3 +1,3 @@
-export default function resolveLocaleArg(fnName: string, optsOrDeprecatedLocale?: {
+export default function resolveLocaleArg(opts?: {
     locale?: string;
-} | string): string | Promise<string>;
+}): Promise<string>;

package/dist/types/src/server.d.ts

@@ -1 +1 @@
-export * from './server/react-client';
+export * from './server/index';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "next-intl",
-  "version": "3.0.0-rc.9",
+  "version": "3.0.0",
   "sideEffects": false,
   "author": "Jan Amann <jan@amann.work>",
   "description": "A minimal, but complete solution for internationalization in Next.js apps.",
@@ -21,8 +21,7 @@
     },
     "./server": {
       "types": "./server.d.ts",
-      "react-server": "./dist/esm/server.react-server.js",
-      "default": "./dist/server.js"
+      "default": "./dist/esm/server.js"
     },
     "./config": {
       "types": "./config.d.ts",
@@ -66,7 +65,7 @@
   "dependencies": {
     "@formatjs/intl-localematcher": "^0.2.32",
     "negotiator": "^0.6.3",
-    "use-intl": "3.0.0-rc.6"
+    "use-intl": "^3.0.0"
   },
   "peerDependencies": {
     "next": "^10.0.0 || ^11.0.0 || ^12.0.0 || ^13.0.0 || ^14.0.0",
@@ -78,7 +77,7 @@
     "@testing-library/react": "^13.0.0",
     "@types/negotiator": "^0.6.1",
     "@types/node": "^17.0.23",
-    "@types/react": "^18.2.29",
+    "@types/react": "18.2.34",
     "eslint": "^8.46.0",
     "eslint-config-molindo": "^7.0.0",
     "eslint-plugin-deprecation": "^1.4.1",
@@ -95,7 +94,7 @@
   "size-limit": [
     {
       "path": "dist/production/index.js",
-      "limit": "12.75 KB"
+      "limit": "12.81 KB"
     },
     {
       "path": "dist/production/navigation.js",
@@ -103,7 +102,7 @@
     },
     {
       "path": "dist/production/server.js",
-      "limit": "0.4 KB"
+      "limit": "13.2 kB"
     },
     {
       "path": "dist/production/middleware.js",

package/dist/development/server/getTranslator.js

@@ -1,25 +0,0 @@
-'use strict';
-
-Object.defineProperty(exports, '__esModule', { value: true });
-
-var React = require('react');
-var getTranslations = require('./getTranslations.js');
-
-// TODO: Remove
-const getDeprecation = React.cache(() => ({
-  hasWarned: false
-}));
-
-/** @deprecated Deprecated in favor of `getTranslations`. See https://github.com/amannn/next-intl/pull/600 */
-async function getTranslator(locale, namespace) {
-  if (!getDeprecation().hasWarned) {
-    console.error("\nDEPRECATION WARNING: `getTranslator` has been deprecated in favor of `getTranslations`:\n\nimport {getTranslations} from 'next-intl/server';\n\n// With implicit request locale\nconst t = await getTranslator('".concat(namespace, "'); \n\n// With explicit locale\nconst t = await getTranslator({locale: '").concat(locale, "', namespace: '").concat(namespace, "'}); \n\nSee https://github.com/amannn/next-intl/pull/600\n"));
-    getDeprecation().hasWarned = true;
-  }
-  return getTranslations.default({
-    locale,
-    namespace
-  });
-}
-
-exports.default = getTranslator;

package/dist/development/server/react-client/index.js

@@ -1,41 +0,0 @@
-'use strict';
-
-Object.defineProperty(exports, '__esModule', { value: true });
-
-function notSupported(name) {
-  return () => {
-    throw new Error("`".concat(name, "` is not supported in Client Components.") );
-  };
-}
-
-// Must match `../index.tsx`
-
-// prettier-ignore
-const getRequestConfig = () => notSupported('getRequestConfig');
-// prettier-ignore
-const getFormatter = notSupported('getFormatter');
-// prettier-ignore
-const getNow = notSupported('getNow');
-// prettier-ignore
-const getTimeZone = notSupported('getTimeZone');
-// prettier-ignore
-/** @deprecated Deprecated in favor of `getTranslations`. See https://github.com/amannn/next-intl/pull/600 */
-const getTranslator = notSupported('getTranslator');
-// prettier-ignore
-const getTranslations = notSupported('getTranslations');
-// prettier-ignore
-const getMessages = notSupported('getMessages');
-// prettier-ignore
-const getLocale = notSupported('getLocale');
-// prettier-ignore
-const unstable_setRequestLocale = notSupported('unstable_setRequestLocale');
-
-exports.getFormatter = getFormatter;
-exports.getLocale = getLocale;
-exports.getMessages = getMessages;
-exports.getNow = getNow;
-exports.getRequestConfig = getRequestConfig;
-exports.getTimeZone = getTimeZone;
-exports.getTranslations = getTranslations;
-exports.getTranslator = getTranslator;
-exports.unstable_setRequestLocale = unstable_setRequestLocale;

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

@@ -1,25 +0,0 @@
-'use strict';
-
-Object.defineProperty(exports, '__esModule', { value: true });
-
-var getRequestConfig = require('./server/getRequestConfig.js');
-var getTranslator = require('./server/getTranslator.js');
-var getFormatter = require('./server/getFormatter.js');
-var getNow = require('./server/getNow.js');
-var getTimeZone = require('./server/getTimeZone.js');
-var getTranslations = require('./server/getTranslations.js');
-var getMessages = require('./server/getMessages.js');
-var getLocale = require('./server/getLocale.js');
-var RequestLocale = require('./server/RequestLocale.js');
-
-
-
-exports.getRequestConfig = getRequestConfig.default;
-exports.getTranslator = getTranslator.default;
-exports.getFormatter = getFormatter.default;
-exports.getNow = getNow.default;
-exports.getTimeZone = getTimeZone.default;
-exports.getTranslations = getTranslations.default;
-exports.getMessages = getMessages.default;
-exports.getLocale = getLocale.default;
-exports.unstable_setRequestLocale = RequestLocale.setRequestLocale;

package/dist/esm/server/getTranslator.js

@@ -1 +0,0 @@
-import{cache as n}from"react";import t from"./getTranslations.js";const a=n((()=>({hasWarned:!1})));async function e(n,e){return a().hasWarned||(console.error("\nDEPRECATION WARNING: `getTranslator` has been deprecated in favor of `getTranslations`:\n\nimport {getTranslations} from 'next-intl/server';\n\n// With implicit request locale\nconst t = await getTranslator('".concat(e,"'); \n\n// With explicit locale\nconst t = await getTranslator({locale: '").concat(n,"', namespace: '").concat(e,"'}); \n\nSee https://github.com/amannn/next-intl/pull/600\n")),a().hasWarned=!0),t({locale:n,namespace:e})}export{e as default};

package/dist/esm/server/react-client/index.js

@@ -1 +0,0 @@
-function e(e){return()=>{throw new Error("`".concat(e,"` is not supported in Client Components."))}}const t=()=>e("getRequestConfig"),o=e("getFormatter"),n=e("getNow"),s=e("getTimeZone"),r=e("getTranslator"),a=e("getTranslations"),g=e("getMessages"),i=e("getLocale"),c=e("unstable_setRequestLocale");export{o as getFormatter,i as getLocale,g as getMessages,n as getNow,t as getRequestConfig,s as getTimeZone,a as getTranslations,r as getTranslator,c as unstable_setRequestLocale};

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

@@ -1 +0,0 @@
-export{default as getRequestConfig}from"./server/getRequestConfig.js";export{default as getTranslator}from"./server/getTranslator.js";export{default as getFormatter}from"./server/getFormatter.js";export{default as getNow}from"./server/getNow.js";export{default as getTimeZone}from"./server/getTimeZone.js";export{default as getTranslations}from"./server/getTranslations.js";export{default as getMessages}from"./server/getMessages.js";export{default as getLocale}from"./server/getLocale.js";export{setRequestLocale as unstable_setRequestLocale}from"./server/RequestLocale.js";

package/dist/production/server/getTranslator.js

@@ -1 +0,0 @@
-"use strict";Object.defineProperty(exports,"__esModule",{value:!0});var e=require("react"),n=require("./getTranslations.js");const t=e.cache((()=>({hasWarned:!1})));exports.default=async function(e,a){return t().hasWarned||(console.error("\nDEPRECATION WARNING: `getTranslator` has been deprecated in favor of `getTranslations`:\n\nimport {getTranslations} from 'next-intl/server';\n\n// With implicit request locale\nconst t = await getTranslator('".concat(a,"'); \n\n// With explicit locale\nconst t = await getTranslator({locale: '").concat(e,"', namespace: '").concat(a,"'}); \n\nSee https://github.com/amannn/next-intl/pull/600\n")),t().hasWarned=!0),n.default({locale:e,namespace:a})};

package/dist/production/server/react-client/index.js

@@ -1 +0,0 @@
-"use strict";function e(e){return()=>{throw new Error(void 0)}}Object.defineProperty(exports,"__esModule",{value:!0});const t=e(),o=e(),r=e(),s=e(),n=e(),p=e(),a=e(),g=e();exports.getFormatter=t,exports.getLocale=a,exports.getMessages=p,exports.getNow=o,exports.getRequestConfig=()=>e(),exports.getTimeZone=r,exports.getTranslations=n,exports.getTranslator=s,exports.unstable_setRequestLocale=g;

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

@@ -1 +0,0 @@
-"use strict";Object.defineProperty(exports,"__esModule",{value:!0});var e=require("./server/getRequestConfig.js"),r=require("./server/getTranslator.js"),t=require("./server/getFormatter.js"),s=require("./server/getNow.js"),o=require("./server/getTimeZone.js"),a=require("./server/getTranslations.js"),u=require("./server/getMessages.js"),g=require("./server/getLocale.js"),l=require("./server/RequestLocale.js");exports.getRequestConfig=e.default,exports.getTranslator=r.default,exports.getFormatter=t.default,exports.getNow=s.default,exports.getTimeZone=o.default,exports.getTranslations=a.default,exports.getMessages=u.default,exports.getLocale=g.default,exports.unstable_setRequestLocale=l.setRequestLocale;

package/dist/server.react-server.js

@@ -1,7 +0,0 @@
-'use strict';
-
-if (process.env.NODE_ENV === 'production') {
-  module.exports = require('./production/server.react-server.js');
-} else {
-  module.exports = require('./development/server.react-server.js');
-}

package/dist/types/src/server/getTranslator.d.ts

@@ -1,41 +0,0 @@
-import { ReactElement, ReactNodeArray } from 'react';
-import { Formats, TranslationValues, MessageKeys, NamespaceKeys, NestedKeyOf, NestedValueOf, RichTranslationValues, MarkupTranslationValues } from 'use-intl/core';
-/** @deprecated Deprecated in favor of `getTranslations`. See https://github.com/amannn/next-intl/pull/600 */
-export default function getTranslator<NestedKey extends NamespaceKeys<IntlMessages, NestedKeyOf<IntlMessages>> = never>(locale: string, namespace?: NestedKey): Promise<{
-    <TargetKey extends MessageKeys<NestedValueOf<{
-        '!': IntlMessages;
-    }, [
-        NestedKey
-    ] extends [never] ? '!' : `!.${NestedKey}`>, NestedKeyOf<NestedValueOf<{
-        '!': IntlMessages;
-    }, [
-        NestedKey
-    ] extends [never] ? '!' : `!.${NestedKey}`>>>>(key: TargetKey, values?: TranslationValues, formats?: Partial<Formats>): string;
-    rich<TargetKey extends MessageKeys<NestedValueOf<{
-        '!': IntlMessages;
-    }, [
-        NestedKey
-    ] extends [never] ? '!' : `!.${NestedKey}`>, NestedKeyOf<NestedValueOf<{
-        '!': IntlMessages;
-    }, [
-        NestedKey
-    ] extends [never] ? '!' : `!.${NestedKey}`>>>>(key: TargetKey, values?: RichTranslationValues, formats?: Partial<Formats>): string | ReactElement | ReactNodeArray;
-    markup<TargetKey extends MessageKeys<NestedValueOf<{
-        '!': IntlMessages;
-    }, [
-        NestedKey
-    ] extends [never] ? '!' : `!.${NestedKey}`>, NestedKeyOf<NestedValueOf<{
-        '!': IntlMessages;
-    }, [
-        NestedKey
-    ] extends [never] ? '!' : `!.${NestedKey}`>>>>(key: TargetKey, values?: MarkupTranslationValues, formats?: Partial<Formats>): string;
-    raw<TargetKey extends MessageKeys<NestedValueOf<{
-        '!': IntlMessages;
-    }, [
-        NestedKey
-    ] extends [never] ? '!' : `!.${NestedKey}`>, NestedKeyOf<NestedValueOf<{
-        '!': IntlMessages;
-    }, [
-        NestedKey
-    ] extends [never] ? '!' : `!.${NestedKey}`>>>>(key: TargetKey): any;
-}>;

package/dist/types/src/server/react-client/index.d.ts

@@ -1,60 +0,0 @@
-/// <reference types="react" />
-import type { getRequestConfig as getRequestConfig_type, getFormatter as getFormatter_type, getNow as getNow_type, getTimeZone as getTimeZone_type, getTranslator as getTranslator_type, getMessages as getMessages_type, getLocale as getLocale_type, unstable_setRequestLocale as unstable_setRequestLocale_type } from '..';
-export declare const getRequestConfig: typeof getRequestConfig_type;
-export declare const getFormatter: typeof getFormatter_type;
-export declare const getNow: typeof getNow_type;
-export declare const getTimeZone: typeof getTimeZone_type;
-/** @deprecated Deprecated in favor of `getTranslations`. See https://github.com/amannn/next-intl/pull/600 */
-export declare const getTranslator: typeof getTranslator_type;
-export declare const getTranslations: {
-    <NestedKey extends string = never>(namespace?: NestedKey | undefined): Promise<{
-        <TargetKey extends import("use-intl/dist/types/src/core/utils/MessageKeys").default<import("use-intl/dist/types/src/core/utils/NestedValueOf").default<{
-            '!': IntlMessages;
-        }, [NestedKey] extends [never] ? "!" : `!.${NestedKey}`>, import("use-intl/dist/types/src/core/utils/NestedKeyOf").default<import("use-intl/dist/types/src/core/utils/NestedValueOf").default<{
-            '!': IntlMessages;
-        }, [NestedKey] extends [never] ? "!" : `!.${NestedKey}`>>>>(key: TargetKey, values?: import("use-intl/dist/types/src/core/TranslationValues").default | undefined, formats?: Partial<import("use-intl/dist/types/src/core/Formats").default> | undefined): string;
-        rich<TargetKey_1 extends import("use-intl/dist/types/src/core/utils/MessageKeys").default<import("use-intl/dist/types/src/core/utils/NestedValueOf").default<{
-            '!': IntlMessages;
-        }, [NestedKey] extends [never] ? "!" : `!.${NestedKey}`>, import("use-intl/dist/types/src/core/utils/NestedKeyOf").default<import("use-intl/dist/types/src/core/utils/NestedValueOf").default<{
-            '!': IntlMessages;
-        }, [NestedKey] extends [never] ? "!" : `!.${NestedKey}`>>>>(key: TargetKey_1, values?: import("use-intl").RichTranslationValues | undefined, formats?: Partial<import("use-intl/dist/types/src/core/Formats").default> | undefined): string | import("react").ReactElement<any, string | import("react").JSXElementConstructor<any>> | import("react").ReactNodeArray;
-        markup<TargetKey_2 extends import("use-intl/dist/types/src/core/utils/MessageKeys").default<import("use-intl/dist/types/src/core/utils/NestedValueOf").default<{
-            '!': IntlMessages;
-        }, [NestedKey] extends [never] ? "!" : `!.${NestedKey}`>, import("use-intl/dist/types/src/core/utils/NestedKeyOf").default<import("use-intl/dist/types/src/core/utils/NestedValueOf").default<{
-            '!': IntlMessages;
-        }, [NestedKey] extends [never] ? "!" : `!.${NestedKey}`>>>>(key: TargetKey_2, values?: import("use-intl").MarkupTranslationValues | undefined, formats?: Partial<import("use-intl/dist/types/src/core/Formats").default> | undefined): string;
-        raw<TargetKey_3 extends import("use-intl/dist/types/src/core/utils/MessageKeys").default<import("use-intl/dist/types/src/core/utils/NestedValueOf").default<{
-            '!': IntlMessages;
-        }, [NestedKey] extends [never] ? "!" : `!.${NestedKey}`>, import("use-intl/dist/types/src/core/utils/NestedKeyOf").default<import("use-intl/dist/types/src/core/utils/NestedValueOf").default<{
-            '!': IntlMessages;
-        }, [NestedKey] extends [never] ? "!" : `!.${NestedKey}`>>>>(key: TargetKey_3): any;
-    }>;
-    <NestedKey_1 extends string = never>(opts?: {
-        locale: string;
-        namespace?: NestedKey_1 | undefined;
-    } | undefined): Promise<{
-        <TargetKey_4 extends import("use-intl/dist/types/src/core/utils/MessageKeys").default<import("use-intl/dist/types/src/core/utils/NestedValueOf").default<{
-            '!': IntlMessages;
-        }, [NestedKey_1] extends [never] ? "!" : `!.${NestedKey_1}`>, import("use-intl/dist/types/src/core/utils/NestedKeyOf").default<import("use-intl/dist/types/src/core/utils/NestedValueOf").default<{
-            '!': IntlMessages;
-        }, [NestedKey_1] extends [never] ? "!" : `!.${NestedKey_1}`>>>>(key: TargetKey_4, values?: import("use-intl/dist/types/src/core/TranslationValues").default | undefined, formats?: Partial<import("use-intl/dist/types/src/core/Formats").default> | undefined): string;
-        rich<TargetKey_5 extends import("use-intl/dist/types/src/core/utils/MessageKeys").default<import("use-intl/dist/types/src/core/utils/NestedValueOf").default<{
-            '!': IntlMessages;
-        }, [NestedKey_1] extends [never] ? "!" : `!.${NestedKey_1}`>, import("use-intl/dist/types/src/core/utils/NestedKeyOf").default<import("use-intl/dist/types/src/core/utils/NestedValueOf").default<{
-            '!': IntlMessages;
-        }, [NestedKey_1] extends [never] ? "!" : `!.${NestedKey_1}`>>>>(key: TargetKey_5, values?: import("use-intl").RichTranslationValues | undefined, formats?: Partial<import("use-intl/dist/types/src/core/Formats").default> | undefined): string | import("react").ReactElement<any, string | import("react").JSXElementConstructor<any>> | import("react").ReactNodeArray;
-        markup<TargetKey_6 extends import("use-intl/dist/types/src/core/utils/MessageKeys").default<import("use-intl/dist/types/src/core/utils/NestedValueOf").default<{
-            '!': IntlMessages;
-        }, [NestedKey_1] extends [never] ? "!" : `!.${NestedKey_1}`>, import("use-intl/dist/types/src/core/utils/NestedKeyOf").default<import("use-intl/dist/types/src/core/utils/NestedValueOf").default<{
-            '!': IntlMessages;
-        }, [NestedKey_1] extends [never] ? "!" : `!.${NestedKey_1}`>>>>(key: TargetKey_6, values?: import("use-intl").MarkupTranslationValues | undefined, formats?: Partial<import("use-intl/dist/types/src/core/Formats").default> | undefined): string;
-        raw<TargetKey_7 extends import("use-intl/dist/types/src/core/utils/MessageKeys").default<import("use-intl/dist/types/src/core/utils/NestedValueOf").default<{
-            '!': IntlMessages;
-        }, [NestedKey_1] extends [never] ? "!" : `!.${NestedKey_1}`>, import("use-intl/dist/types/src/core/utils/NestedKeyOf").default<import("use-intl/dist/types/src/core/utils/NestedValueOf").default<{
-            '!': IntlMessages;
-        }, [NestedKey_1] extends [never] ? "!" : `!.${NestedKey_1}`>>>>(key: TargetKey_7): any;
-    }>;
-};
-export declare const getMessages: typeof getMessages_type;
-export declare const getLocale: typeof getLocale_type;
-export declare const unstable_setRequestLocale: typeof unstable_setRequestLocale_type;

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

@@ -1 +0,0 @@
-export * from './server/index';