next-intl 3.2.2 → 3.2.4

package/dist/development/react-client/useLocale.js

@@ -7,16 +7,19 @@ var _useLocale = require('use-intl/_useLocale');
 var constants = require('../shared/constants.js');
 
 function useLocale() {
-  let locale;
-
   // The types aren't entirely correct here. Outside of Next.js
   // `useParams` can be called, but the return type is `null`.
   const params = navigation.useParams();
-  if (typeof (params === null || params === void 0 ? void 0 : params[constants.LOCALE_SEGMENT_NAME]) === 'string') {
-    locale = params[constants.LOCALE_SEGMENT_NAME];
-  } else {
-    // eslint-disable-next-line react-hooks/rules-of-hooks -- Reading from context conditionally is fine as long as we're in the render phase
+  let locale;
+  try {
+    // eslint-disable-next-line react-hooks/rules-of-hooks -- False positive
     locale = _useLocale.useLocale();
+  } catch (error) {
+    if (typeof (params === null || params === void 0 ? void 0 : params[constants.LOCALE_SEGMENT_NAME]) === 'string') {
+      locale = params[constants.LOCALE_SEGMENT_NAME];
+    } else {
+      throw error;
+    }
   }
   return locale;
 }

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

@@ -21,9 +21,13 @@ function getRequestConfig() {
 const getFormatter = notSupported('getFormatter');
 const getNow = notSupported('getNow');
 const getTimeZone = notSupported('getTimeZone');
-const getTranslations = notSupported('getTranslations');
 const getMessages = notSupported('getMessages');
 const getLocale = notSupported('getLocale');
+
+// The type of `getTranslations` is not assigned here because it
+// causes a type error. The types use the `react-server` entry
+// anyway, therefore this is irrelevant.
+const getTranslations = notSupported('getTranslations');
 const unstable_setRequestLocale = notSupported('unstable_setRequestLocale');
 
 exports.getFormatter = getFormatter;

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

@@ -8,7 +8,6 @@ function _interopDefault (e) { return e && e.__esModule ? e : { default: e }; }
 
 var getRuntimeConfig__default = /*#__PURE__*/_interopDefault(getRuntimeConfig);
 
-// @ts-expect-error
 // eslint-disable-next-line import/no-extraneous-dependencies
 
 Object.defineProperty(exports, 'default', {

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

@@ -10,6 +10,10 @@ var getLocale = require('./getLocale.js');
 // Maintainer note: `getTranslations` has two different call signatures.
 // We need to define these with function overloads, otherwise TypeScript
 // messes up the return type.
+
+// CALL SIGNATURE 1: `getTranslations(namespace)`
+// CALL SIGNATURE 2: `getTranslations({locale, namespace})`
+// IMPLEMENTATION
 async function getTranslations(namespaceOrOpts) {
   let namespace;
   let locale;

package/dist/esm/react-client/useLocale.js

@@ -1 +1 @@
-import{useParams as t}from"next/navigation";import{useLocale as o}from"use-intl/_useLocale";import{LOCALE_SEGMENT_NAME as e}from"../shared/constants.js";function n(){let n;const r=t();return n="string"==typeof(null==r?void 0:r[e])?r[e]:o(),n}export{n as default};
+import{useParams as t}from"next/navigation";import{useLocale as o}from"use-intl/_useLocale";import{LOCALE_SEGMENT_NAME as r}from"../shared/constants.js";function e(){const e=t();let n;try{n=o()}catch(t){if("string"!=typeof(null==e?void 0:e[r]))throw t;n=e[r]}return n}export{e as default};

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

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

package/dist/production/react-client/useLocale.js

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,"__esModule",{value:!0});var e=require("next/navigation"),t=require("use-intl/_useLocale"),r=require("../shared/constants.js");exports.default=function(){let s;const u=e.useParams();return s="string"==typeof(null==u?void 0:u[r.LOCALE_SEGMENT_NAME])?u[r.LOCALE_SEGMENT_NAME]:t.useLocale(),s};
+"use strict";Object.defineProperty(exports,"__esModule",{value:!0});var e=require("next/navigation"),t=require("use-intl/_useLocale"),r=require("../shared/constants.js");exports.default=function(){const s=e.useParams();let u;try{u=t.useLocale()}catch(e){if("string"!=typeof(null==s?void 0:s[r.LOCALE_SEGMENT_NAME]))throw e;u=s[r.LOCALE_SEGMENT_NAME]}return u};

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

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

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

@@ -1,58 +1,9 @@
-/// <reference types="react" />
 import type { getRequestConfig as getRequestConfig_type, getFormatter as getFormatter_type, getNow as getNow_type, getTimeZone as getTimeZone_type, getMessages as getMessages_type, getLocale as getLocale_type, unstable_setRequestLocale as unstable_setRequestLocale_type } from '../react-server';
 export declare function getRequestConfig(...args: Parameters<typeof getRequestConfig_type>): ReturnType<typeof getRequestConfig_type>;
 export declare const getFormatter: typeof getFormatter_type;
 export declare const getNow: typeof getNow_type;
 export declare const getTimeZone: typeof getTimeZone_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] extends [never] ? string : 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] extends [never] ? string : 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] extends [never] ? string : 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] extends [never] ? string : 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 getTranslations: () => never;
 export declare const unstable_setRequestLocale: typeof unstable_setRequestLocale_type;

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

@@ -1,23 +1,8 @@
-declare const getConfig: (locale: string) => Promise<Omit<{
-    locale: string;
-    now: Date;
-    timeZone: string;
-    formats?: Partial<import("use-intl/dist/types/src/core/Formats").default> | undefined;
-    onError?: ((error: import("use-intl/core").IntlError) => void) | undefined;
-    getMessageFallback?: ((info: {
-        error: import("use-intl/core").IntlError;
-        key: string;
-        namespace?: string | undefined;
-    }) => string) | undefined;
-    messages?: import("use-intl/dist/types/src/core/AbstractIntlMessages").default | undefined;
-    defaultTranslationValues?: import("use-intl/core").RichTranslationValues | undefined;
-}, "onError" | "getMessageFallback" | "messages"> & {
-    messages: import("use-intl/dist/types/src/core/AbstractIntlMessages").default | undefined;
-    onError: typeof import("use-intl/dist/types/src/core/defaults").defaultOnError;
-    getMessageFallback: (info: {
-        error: import("use-intl/core").IntlError;
-        key: string;
-        namespace?: string | undefined;
-    }) => string;
+import { IntlConfig } from 'use-intl/core';
+declare const getConfig: (locale: string) => Promise<IntlConfig & {
+    getMessageFallback: NonNullable<IntlConfig['getMessageFallback']>;
+    now: NonNullable<IntlConfig['now']>;
+    onError: NonNullable<IntlConfig['onError']>;
+    timeZone: NonNullable<IntlConfig['timeZone']>;
 }>;
 export default getConfig;

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

@@ -1,3 +1,4 @@
+import { createFormatter } from 'use-intl/core';
 /**
  * Returns a formatter based on the given locale.
  *
@@ -6,9 +7,4 @@
  */
 export default function getFormatter(opts?: {
     locale?: string;
-}): 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;
-    list: (value: Iterable<string>, formatOrOptions?: string | Intl.ListFormatOptions | undefined) => string;
-}>;
+}): Promise<ReturnType<typeof createFormatter>>;

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

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

package/package.json

@@ -1,8 +1,14 @@
 {
   "name": "next-intl",
-  "version": "3.2.2",
+  "version": "3.2.4",
   "sideEffects": false,
   "author": "Jan Amann <jan@amann.work>",
+  "funding": [
+    {
+      "type": "individual",
+      "url": "https://github.com/sponsors/amannn"
+    }
+  ],
   "description": "A minimal, but complete solution for internationalization in Next.js apps.",
   "license": "MIT",
   "homepage": "https://next-intl-docs.vercel.app",
@@ -74,7 +80,7 @@
   "dependencies": {
     "@formatjs/intl-localematcher": "^0.2.32",
     "negotiator": "^0.6.3",
-    "use-intl": "^3.2.2"
+    "use-intl": "^3.2.4"
   },
   "peerDependencies": {
     "next": "^10.0.0 || ^11.0.0 || ^12.0.0 || ^13.0.0 || ^14.0.0",
@@ -85,7 +91,7 @@
     "@size-limit/preset-big-lib": "^8.2.6",
     "@testing-library/react": "^13.0.0",
     "@types/negotiator": "^0.6.1",
-    "@types/node": "^17.0.23",
+    "@types/node": "^20.1.2",
     "@types/react": "18.2.34",
     "@types/react-dom": "^18.2.17",
     "eslint": "^8.54.0",
@@ -99,12 +105,12 @@
     "rollup-plugin-preserve-directives": "0.2.0",
     "size-limit": "^8.2.6",
     "typescript": "^5.2.2",
-    "vitest": "^0.32.2"
+    "vitest": "^1.0.1"
   },
   "size-limit": [
     {
       "path": "dist/production/index.react-client.js",
-      "limit": "12.81 KB"
+      "limit": "12.82 KB"
     },
     {
       "path": "dist/production/index.react-server.js",
@@ -112,11 +118,11 @@
     },
     {
       "path": "dist/production/navigation.react-client.js",
-      "limit": "2.62 KB"
+      "limit": "2.63 KB"
     },
     {
       "path": "dist/production/navigation.react-server.js",
-      "limit": "2.8 KB"
+      "limit": "2.82 KB"
     },
     {
       "path": "dist/production/server.react-client.js",
@@ -131,5 +137,5 @@
       "limit": "5.72 KB"
     }
   ],
-  "gitHead": "4369c7612b860ab31a173e7f045a839aa742f711"
+  "gitHead": "f8b245523f9b37a543d8ab0d52c89a1b79e275e3"
 }