react-intl 4.2.2 → 4.5.0

package/dist/types.d.ts

@@ -29,7 +29,7 @@ export declare type FormatRelativeTimeOptions = Exclude<IntlRelativeTimeFormatOp
 export declare type FormatPluralOptions = Exclude<Intl.PluralRulesOptions, 'localeMatcher'> & CustomFormatConfig;
 export declare type FormatListOptions = Exclude<IntlListFormatOptions, 'localeMatcher'>;
 export declare type FormatDisplayNameOptions = Exclude<DisplayNamesOptions, 'localeMatcher'>;
-export interface IntlFormatters<T = React.ReactNode> {
+export interface IntlFormatters<T = React.ReactNode, R = T> {
     formatDate(value: Parameters<Intl.DateTimeFormat['format']>[0] | string, opts?: FormatDateOptions): string;
     formatTime(value: Parameters<Intl.DateTimeFormat['format']>[0] | string, opts?: FormatDateOptions): string;
     formatDateToParts(value: Parameters<Intl.DateTimeFormat['format']>[0] | string, opts?: FormatDateOptions): Intl.DateTimeFormatPart[];
@@ -39,7 +39,7 @@ export interface IntlFormatters<T = React.ReactNode> {
     formatNumberToParts(value: Parameters<Intl.NumberFormat['format']>[0], opts?: FormatNumberOptions): Intl.NumberFormatPart[];
     formatPlural(value: Parameters<Intl.PluralRules['select']>[0], opts?: FormatPluralOptions): ReturnType<Intl.PluralRules['select']>;
     formatMessage(descriptor: MessageDescriptor, values?: Record<string, PrimitiveType>): string;
-    formatMessage(descriptor: MessageDescriptor, values?: Record<string, PrimitiveType | React.ReactElement | FormatXMLElementFn<T>>): string | React.ReactNodeArray;
+    formatMessage(descriptor: MessageDescriptor, values?: Record<string, PrimitiveType | React.ReactElement | FormatXMLElementFn<T, R>>): string | React.ReactNodeArray;
     formatList(values: Array<string>, opts?: FormatListOptions): string;
     formatList(values: Array<string | React.ReactNode>, opts?: FormatListOptions): React.ReactNode;
     formatDisplayName(value: Parameters<DisplayNames['of']>[0], opts?: FormatDisplayNameOptions): string | undefined;

package/lib/components/createFormattedComponent.js

@@ -51,7 +51,9 @@ export function createFormattedDateTimePartsComponent(name) {
 export function createFormattedComponent(name) {
     const Component = props => (React.createElement(Context.Consumer, null, (intl) => {
         invariantIntlContext(intl);
-        const { value, children } = props, formatProps = __rest(props, ["value", "children"]);
+        const { value, children } = props, formatProps = __rest(props
+        // TODO: fix TS type definition for localeMatcher upstream
+        , ["value", "children"]);
         // TODO: fix TS type definition for localeMatcher upstream
         const formattedValue = intl[name](value, formatProps);
         if (typeof children === 'function') {

package/lib/components/injectIntl.js

@@ -20,9 +20,8 @@ export default function injectIntl(WrappedComponent, options) {
         if (enforceContext) {
             invariantIntlContext(intl);
         }
-        return (React.createElement(WrappedComponent, Object.assign({}, props, {
-            [intlPropName]: intl,
-        }, { ref: forwardRef ? props.forwardedRef : null })));
+        const intlProp = { [intlPropName]: intl };
+        return (React.createElement(WrappedComponent, Object.assign({}, props, intlProp, { ref: forwardRef ? props.forwardedRef : null })));
     }));
     WithIntl.displayName = `injectIntl(${getDisplayName(WrappedComponent)})`;
     WithIntl.WrappedComponent = WrappedComponent;

package/lib/components/message.d.ts

@@ -6,7 +6,7 @@ export interface Props<V extends Record<string, any> = Record<string, React.Reac
     tagName?: React.ElementType<any>;
     children?(...nodes: React.ReactNodeArray): React.ReactNode;
 }
-declare class FormattedMessage<T = React.ReactNode, V extends Record<string, any> = Record<string, PrimitiveType | React.ReactElement | FormatXMLElementFn<T>>> extends React.Component<Props<V>> {
+declare class FormattedMessage<V extends Record<string, any> = Record<string, PrimitiveType | React.ReactElement | FormatXMLElementFn<React.ReactNode, React.ReactNode>>> extends React.Component<Props<V>> {
     static displayName: string;
     static defaultProps: {
         values: {};

package/lib/error.d.ts

@@ -1,3 +1,4 @@
+import { MessageDescriptor } from './types';
 export declare const enum ReactIntlErrorCode {
     FORMAT_ERROR = "FORMAT_ERROR",
     UNSUPPORTED_FORMATTER = "UNSUPPORTED_FORMATTER",
@@ -6,6 +7,7 @@ export declare const enum ReactIntlErrorCode {
     MISSING_TRANSLATION = "MISSING_TRANSLATION"
 }
 export declare class ReactIntlError extends Error {
-    code: ReactIntlErrorCode;
-    constructor(code: ReactIntlErrorCode, message: string, exception?: Error);
+    readonly code: ReactIntlErrorCode;
+    readonly descriptor?: MessageDescriptor;
+    constructor(code: ReactIntlErrorCode, message: string, descriptor?: MessageDescriptor, exception?: Error);
 }

package/lib/error.js

@@ -7,9 +7,10 @@ export var ReactIntlErrorCode;
     ReactIntlErrorCode["MISSING_TRANSLATION"] = "MISSING_TRANSLATION";
 })(ReactIntlErrorCode || (ReactIntlErrorCode = {}));
 export class ReactIntlError extends Error {
-    constructor(code, message, exception) {
+    constructor(code, message, descriptor, exception) {
         super(`[React Intl Error ${code}] ${message} ${exception ? `\n${exception.stack}` : ''}`);
         this.code = code;
+        this.descriptor = descriptor;
         if (typeof Error.captureStackTrace === 'function') {
             Error.captureStackTrace(this, ReactIntlError);
         }

package/lib/formatters/message.js

@@ -47,7 +47,7 @@ export function formatMessage({ locale, formats, messages, defaultLocale, defaul
         }
         catch (e) {
             onError(new ReactIntlError("FORMAT_ERROR" /* FORMAT_ERROR */, `Error formatting message: "${id}" for locale: "${locale}"` +
-                (defaultMessage ? ', using default message as fallback.' : ''), e));
+                (defaultMessage ? ', using default message as fallback.' : ''), messageDescriptor, e));
         }
     }
     else if (!defaultMessage ||
@@ -56,7 +56,7 @@ export function formatMessage({ locale, formats, messages, defaultLocale, defaul
         // when no `messages` are passed into the <IntlProvider> for the
         // default locale.
         onError(new ReactIntlError("MISSING_TRANSLATION" /* MISSING_TRANSLATION */, `Missing message: "${id}" for locale: "${locale}"` +
-            (defaultMessage ? ', using default message as fallback.' : '')));
+            (defaultMessage ? ', using default message as fallback.' : ''), messageDescriptor));
     }
     if (!formattedMessageParts && defaultMessage) {
         try {
@@ -64,12 +64,12 @@ export function formatMessage({ locale, formats, messages, defaultLocale, defaul
             formattedMessageParts = formatter.format(values);
         }
         catch (e) {
-            onError(new ReactIntlError("FORMAT_ERROR" /* FORMAT_ERROR */, `Error formatting the default message for: "${id}"`, e));
+            onError(new ReactIntlError("FORMAT_ERROR" /* FORMAT_ERROR */, `Error formatting the default message for: "${id}"`, messageDescriptor, e));
         }
     }
     if (!formattedMessageParts) {
         onError(new ReactIntlError("FORMAT_ERROR" /* FORMAT_ERROR */, `Cannot format message: "${id}", ` +
-            `using message ${message || defaultMessage ? 'source' : 'id'} as fallback.`));
+            `using message ${message || defaultMessage ? 'source' : 'id'} as fallback.`, messageDescriptor));
         if (typeof message === 'string') {
             return message || defaultMessage || String(id);
         }

package/lib/formatters/relativeTime.js

@@ -1,10 +1,7 @@
 import { getNamedFormat, filterProps } from '../utils';
 import { FormatError } from 'intl-messageformat';
 import { ReactIntlError } from '../error';
-const RELATIVE_TIME_FORMAT_OPTIONS = [
-    'numeric',
-    'style',
-];
+const RELATIVE_TIME_FORMAT_OPTIONS = ['numeric', 'style'];
 function getFormatter({ locale, formats, onError, }, getRelativeTimeFormat, options = {}) {
     const { format } = options;
     const defaults = (!!format && getNamedFormat(formats, 'relative', format, onError)) || {};

package/lib/index.d.ts

@@ -1,6 +1,7 @@
 import * as React from 'react';
 export * from './types';
 export declare function defineMessages<T, U extends Record<string, T>>(msgs: U): U;
+export declare function defineMessage<T>(msg: T): T;
 import { CustomFormatConfig } from './types';
 import { UnifiedNumberFormatOptions } from '@formatjs/intl-unified-numberformat';
 import { IntlListFormatOptions } from '@formatjs/intl-listformat';

package/lib/index.js

@@ -1,6 +1,9 @@
 export function defineMessages(msgs) {
     return msgs;
 }
+export function defineMessage(msg) {
+    return msg;
+}
 import { createFormattedComponent, createFormattedDateTimePartsComponent, } from './components/createFormattedComponent';
 export { default as injectIntl, Provider as RawIntlProvider, Context as IntlContext, } from './components/injectIntl';
 export { default as useIntl } from './components/useIntl';

package/lib/react-intl.d.ts

@@ -11,7 +11,7 @@ import IntlRelativeTimeFormat from '@formatjs/intl-relativetimeformat';
 import { IntlRelativeTimeFormatOptions } from '@formatjs/intl-relativetimeformat';
 import { MessageFormatElement } from 'intl-messageformat-parser';
 import { PrimitiveType } from 'intl-messageformat';
-import * as React from 'react';
+import * as React_2 from 'react';
 import { UnifiedNumberFormatOptions } from '@formatjs/intl-unified-numberformat';
 import { Unit } from '@formatjs/intl-relativetimeformat';
 
@@ -34,6 +34,8 @@ export declare interface CustomFormats extends Partial<Formats> {
 
 declare const DEFAULT_INTL_CONFIG: Pick<IntlConfig, 'formats' | 'messages' | 'timeZone' | 'textComponent' | 'defaultLocale' | 'defaultFormats' | 'onError'>;
 
+export declare function defineMessage<T>(msg: T): T;
+
 export declare function defineMessages<T, U extends Record<string, T>>(msgs: U): U;
 
 export declare type FormatDateOptions = Exclude<Intl.DateTimeFormatOptions, 'localeMatcher'> & CustomFormatConfig;
@@ -48,24 +50,24 @@ export declare type FormatPluralOptions = Exclude<Intl.PluralRulesOptions, 'loca
 
 export declare type FormatRelativeTimeOptions = Exclude<IntlRelativeTimeFormatOptions, 'localeMatcher'> & CustomFormatConfig;
 
-export declare const FormattedDate: React.FC<Intl.DateTimeFormatOptions & CustomFormatConfig & {
+export declare const FormattedDate: React_2.FC<Intl.DateTimeFormatOptions & CustomFormatConfig & {
     value: string | number | Date | undefined;
 }>;
 
-export declare const FormattedDateParts: React.FC<Intl.DateTimeFormatOptions & CustomFormatConfig & {
+export declare const FormattedDateParts: React_2.FC<Intl.DateTimeFormatOptions & CustomFormatConfig & {
     value: string | number | Date | undefined;
-    children(val: Intl.DateTimeFormatPart[]): React.ReactElement<any, string | ((props: any) => React.ReactElement<any, string | any | (new (props: any) => React.Component<any, any, any>)> | null) | (new (props: any) => React.Component<any, any, any>)> | null;
+    children(val: Intl.DateTimeFormatPart[]): React_2.ReactElement<any, string | ((props: any) => React_2.ReactElement<any, string | any | (new (props: any) => React_2.Component<any, any, any>)> | null) | (new (props: any) => React_2.Component<any, any, any>)> | null;
 }>;
 
-export declare const FormattedDisplayName: React.FC<DisplayNamesOptions_2 & {
+export declare const FormattedDisplayName: React_2.FC<DisplayNamesOptions_2 & {
     value: string | number | object;
 }>;
 
-export declare const FormattedList: React.FC<IntlListFormatOptions & {
-    value: React.ReactNode[];
+export declare const FormattedList: React_2.FC<IntlListFormatOptions & {
+    value: React_2.ReactNode[];
 }>;
 
-export declare class FormattedMessage<T = React.ReactNode, V extends Record<string, any> = Record<string, PrimitiveType | React.ReactElement | FormatXMLElementFn<T>>> extends React.Component<Props_3<V>> {
+export declare class FormattedMessage<V extends Record<string, any> = Record<string, PrimitiveType | React_2.ReactElement | FormatXMLElementFn<React_2.ReactNode, React_2.ReactNode>>> extends React_2.Component<Props_3<V>> {
     static displayName: string;
     static defaultProps: {
         values: {};
@@ -74,22 +76,22 @@ export declare class FormattedMessage<T = React.ReactNode, V extends Record<stri
     render(): JSX.Element;
 }
 
-export declare const FormattedNumber: React.FC<UnifiedNumberFormatOptions & CustomFormatConfig & {
+export declare const FormattedNumber: React_2.FC<UnifiedNumberFormatOptions & CustomFormatConfig & {
     value: number;
 }>;
 
-export declare const FormattedNumberParts: React.FC<Formatter['formatNumber'] & {
+export declare const FormattedNumberParts: React_2.FC<Formatter['formatNumber'] & {
     value: Parameters<IntlShape['formatNumber']>[0];
-    children(val: Intl.NumberFormatPart[]): React.ReactElement | null;
+    children(val: Intl.NumberFormatPart[]): React_2.ReactElement | null;
 }>;
 
-export declare const FormattedPlural: React.ForwardRefExoticComponent<Pick<Props_2, "children" | "other" | "zero" | "one" | "two" | "few" | "many" | "localeMatcher" | "format" | "type" | "value"> & {
-    forwardedRef?: ((instance: any) => void) | React.RefObject<any> | null | undefined;
-} & React.RefAttributes<any>> & {
-    WrappedComponent: React.ComponentType<Props_2>;
+export declare const FormattedPlural: React_2.ForwardRefExoticComponent<Pick<Props_2, "children" | "other" | "zero" | "one" | "two" | "few" | "many" | "localeMatcher" | "format" | "type" | "value"> & {
+    forwardedRef?: ((instance: any) => void) | React_2.RefObject<any> | null | undefined;
+} & React_2.RefAttributes<any>> & {
+    WrappedComponent: React_2.ComponentType<Props_2>;
 };
 
-export declare class FormattedRelativeTime extends React.PureComponent<Props, State_2> {
+export declare class FormattedRelativeTime extends React_2.PureComponent<Props, State_2> {
     _updateTimer: any;
     static displayName: string;
     static defaultProps: Pick<Props, 'unit' | 'value'>;
@@ -103,13 +105,13 @@ export declare class FormattedRelativeTime extends React.PureComponent<Props, St
     render(): JSX.Element;
 }
 
-export declare const FormattedTime: React.FC<Intl.DateTimeFormatOptions & CustomFormatConfig & {
+export declare const FormattedTime: React_2.FC<Intl.DateTimeFormatOptions & CustomFormatConfig & {
     value: string | number | Date | undefined;
 }>;
 
-export declare const FormattedTimeParts: React.FC<Intl.DateTimeFormatOptions & CustomFormatConfig & {
+export declare const FormattedTimeParts: React_2.FC<Intl.DateTimeFormatOptions & CustomFormatConfig & {
     value: string | number | Date | undefined;
-    children(val: Intl.DateTimeFormatPart[]): React.ReactElement<any, string | ((props: any) => React.ReactElement<any, string | any | (new (props: any) => React.Component<any, any, any>)> | null) | (new (props: any) => React.Component<any, any, any>)> | null;
+    children(val: Intl.DateTimeFormatPart[]): React_2.ReactElement<any, string | ((props: any) => React_2.ReactElement<any, string | any | (new (props: any) => React_2.Component<any, any, any>)> | null) | (new (props: any) => React_2.Component<any, any, any>)> | null;
 }>;
 
 declare type Formatter = {
@@ -130,12 +132,12 @@ export declare interface Formatters {
     getDisplayNames(...args: ConstructorParameters<typeof DisplayNames>): DisplayNames;
 }
 
-export declare function injectIntl<IntlPropName extends string, P extends WrappedComponentProps<IntlPropName> = WrappedComponentProps<any>>(WrappedComponent: React.ComponentType<P>, options?: Opts<IntlPropName, false>): React.FC<WithIntlProps<P>> & {
-    WrappedComponent: React.ComponentType<P>;
+export declare function injectIntl<IntlPropName extends string, P extends WrappedComponentProps<IntlPropName> = WrappedComponentProps<any>>(WrappedComponent: React_2.ComponentType<P>, options?: Opts<IntlPropName, false>): React_2.FC<WithIntlProps<P>> & {
+    WrappedComponent: React_2.ComponentType<P>;
 };
 
-export declare function injectIntl<IntlPropName extends string = 'intl', P extends WrappedComponentProps<IntlPropName> = WrappedComponentProps<any>, T extends React.ComponentType<P> = any>(WrappedComponent: React.ComponentType<P>, options?: Opts<IntlPropName, true>): React.ForwardRefExoticComponent<React.PropsWithoutRef<WithIntlProps<P>> & React.RefAttributes<T>> & {
-    WrappedComponent: React.ComponentType<P>;
+export declare function injectIntl<IntlPropName extends string = 'intl', P extends WrappedComponentProps<IntlPropName> = WrappedComponentProps<any>, T extends React_2.ComponentType<P> = any>(WrappedComponent: React_2.ComponentType<P>, options?: Opts<IntlPropName, true>): React_2.ForwardRefExoticComponent<React_2.PropsWithoutRef<WithIntlProps<P>> & React_2.RefAttributes<T>> & {
+    WrappedComponent: React_2.ComponentType<P>;
 };
 
 export declare interface IntlCache {
@@ -152,7 +154,7 @@ export declare interface IntlConfig {
     locale: string;
     timeZone?: string;
     formats: CustomFormats;
-    textComponent?: React.ComponentType | keyof React.ReactHTML;
+    textComponent?: React_2.ComponentType | keyof React_2.ReactHTML;
     messages: Record<string, string> | Record<string, MessageFormatElement[]>;
     defaultLocale: string;
     defaultFormats: CustomFormats;
@@ -160,9 +162,9 @@ export declare interface IntlConfig {
     onError(err: ReactIntlError | FormatError): void;
 }
 
-export declare const IntlContext: React.Context<IntlShape>;
+export declare const IntlContext: React_2.Context<IntlShape>;
 
-export declare interface IntlFormatters<T = React.ReactNode> {
+export declare interface IntlFormatters<T = React_2.ReactNode, R = T> {
     formatDate(value: Parameters<Intl.DateTimeFormat['format']>[0] | string, opts?: FormatDateOptions): string;
     formatTime(value: Parameters<Intl.DateTimeFormat['format']>[0] | string, opts?: FormatDateOptions): string;
     formatDateToParts(value: Parameters<Intl.DateTimeFormat['format']>[0] | string, opts?: FormatDateOptions): Intl.DateTimeFormatPart[];
@@ -172,13 +174,13 @@ export declare interface IntlFormatters<T = React.ReactNode> {
     formatNumberToParts(value: Parameters<Intl.NumberFormat['format']>[0], opts?: FormatNumberOptions): Intl.NumberFormatPart[];
     formatPlural(value: Parameters<Intl.PluralRules['select']>[0], opts?: FormatPluralOptions): ReturnType<Intl.PluralRules['select']>;
     formatMessage(descriptor: MessageDescriptor, values?: Record<string, PrimitiveType>): string;
-    formatMessage(descriptor: MessageDescriptor, values?: Record<string, PrimitiveType | React.ReactElement | FormatXMLElementFn<T>>): string | React.ReactNodeArray;
+    formatMessage(descriptor: MessageDescriptor, values?: Record<string, PrimitiveType | React_2.ReactElement | FormatXMLElementFn<T, R>>): string | React_2.ReactNodeArray;
     formatList(values: Array<string>, opts?: FormatListOptions): string;
-    formatList(values: Array<string | React.ReactNode>, opts?: FormatListOptions): React.ReactNode;
+    formatList(values: Array<string | React_2.ReactNode>, opts?: FormatListOptions): React_2.ReactNode;
     formatDisplayName(value: Parameters<DisplayNames['of']>[0], opts?: FormatDisplayNameOptions): string | undefined;
 }
 
-export declare class IntlProvider extends React.PureComponent<OptionalIntlConfig, State> {
+export declare class IntlProvider extends React_2.PureComponent<OptionalIntlConfig, State> {
     static displayName: string;
     static defaultProps: Pick<IntlConfig, "formats" | "messages" | "timeZone" | "textComponent" | "defaultLocale" | "defaultFormats" | "onError">;
     private cache;
@@ -197,9 +199,10 @@ export declare interface MessageDescriptor {
     defaultMessage?: string;
 }
 
-export declare type Omit<T, K extends keyof any> = Pick<T, Exclude<keyof T, K>>;
+declare type Omit_2<T, K extends keyof any> = Pick<T, Exclude<keyof T, K>>;
+export { Omit_2 as Omit }
 
-declare type OptionalIntlConfig = Omit<IntlConfig, keyof typeof DEFAULT_INTL_CONFIG> & Partial<typeof DEFAULT_INTL_CONFIG>;
+declare type OptionalIntlConfig = Omit_2<IntlConfig, keyof typeof DEFAULT_INTL_CONFIG> & Partial<typeof DEFAULT_INTL_CONFIG>;
 
 declare interface Opts<IntlPropName extends string = 'intl', ForwardRef extends boolean = false> {
     intlPropName?: IntlPropName;
@@ -211,32 +214,33 @@ declare interface Props extends FormatRelativeTimeOptions {
     value?: number;
     unit?: Unit;
     updateIntervalInSeconds?: number;
-    children?(value: string): React.ReactChild;
+    children?(value: string): React_2.ReactChild;
 }
 
 declare interface Props_2 extends FormatPluralOptions {
     value: number;
     intl: IntlShape;
-    other: React.ReactNode;
-    zero?: React.ReactNode;
-    one?: React.ReactNode;
-    two?: React.ReactNode;
-    few?: React.ReactNode;
-    many?: React.ReactNode;
-    children?(value: React.ReactNode): React.ReactElement | null;
+    other: React_2.ReactNode;
+    zero?: React_2.ReactNode;
+    one?: React_2.ReactNode;
+    two?: React_2.ReactNode;
+    few?: React_2.ReactNode;
+    many?: React_2.ReactNode;
+    children?(value: React_2.ReactNode): React_2.ReactElement | null;
 }
 
-declare interface Props_3<V extends Record<string, any> = Record<string, React.ReactNode>> extends MessageDescriptor {
+declare interface Props_3<V extends Record<string, any> = Record<string, React_2.ReactNode>> extends MessageDescriptor {
     values?: V;
-    tagName?: React.ElementType<any>;
-    children?(...nodes: React.ReactNodeArray): React.ReactNode;
+    tagName?: React_2.ElementType<any>;
+    children?(...nodes: React_2.ReactNodeArray): React_2.ReactNode;
 }
 
-export declare const RawIntlProvider: React.Provider<IntlShape>;
+export declare const RawIntlProvider: React_2.Provider<IntlShape>;
 
 export declare class ReactIntlError extends Error {
-    code: ReactIntlErrorCode;
-    constructor(code: ReactIntlErrorCode, message: string, exception?: Error);
+    readonly code: ReactIntlErrorCode;
+    readonly descriptor?: MessageDescriptor;
+    constructor(code: ReactIntlErrorCode, message: string, descriptor?: MessageDescriptor, exception?: Error);
 }
 
 export declare const enum ReactIntlErrorCode {
@@ -272,8 +276,8 @@ declare interface State_2 {
 
 export declare function useIntl(): IntlShape;
 
-export declare type WithIntlProps<P> = Omit<P, keyof WrappedComponentProps> & {
-    forwardedRef?: React.Ref<any>;
+export declare type WithIntlProps<P> = Omit_2<P, keyof WrappedComponentProps> & {
+    forwardedRef?: React_2.Ref<any>;
 };
 
 export declare type WrappedComponentProps<IntlPropName extends string = 'intl'> = {

package/lib/tsdoc-metadata.json

@@ -5,7 +5,7 @@
   "toolPackages": [
     {
       "packageName": "@microsoft/api-extractor",
-      "packageVersion": "7.7.10"
+      "packageVersion": "7.7.13"
     }
   ]
 }

package/lib/types.d.ts

@@ -29,7 +29,7 @@ export declare type FormatRelativeTimeOptions = Exclude<IntlRelativeTimeFormatOp
 export declare type FormatPluralOptions = Exclude<Intl.PluralRulesOptions, 'localeMatcher'> & CustomFormatConfig;
 export declare type FormatListOptions = Exclude<IntlListFormatOptions, 'localeMatcher'>;
 export declare type FormatDisplayNameOptions = Exclude<DisplayNamesOptions, 'localeMatcher'>;
-export interface IntlFormatters<T = React.ReactNode> {
+export interface IntlFormatters<T = React.ReactNode, R = T> {
     formatDate(value: Parameters<Intl.DateTimeFormat['format']>[0] | string, opts?: FormatDateOptions): string;
     formatTime(value: Parameters<Intl.DateTimeFormat['format']>[0] | string, opts?: FormatDateOptions): string;
     formatDateToParts(value: Parameters<Intl.DateTimeFormat['format']>[0] | string, opts?: FormatDateOptions): Intl.DateTimeFormatPart[];
@@ -39,7 +39,7 @@ export interface IntlFormatters<T = React.ReactNode> {
     formatNumberToParts(value: Parameters<Intl.NumberFormat['format']>[0], opts?: FormatNumberOptions): Intl.NumberFormatPart[];
     formatPlural(value: Parameters<Intl.PluralRules['select']>[0], opts?: FormatPluralOptions): ReturnType<Intl.PluralRules['select']>;
     formatMessage(descriptor: MessageDescriptor, values?: Record<string, PrimitiveType>): string;
-    formatMessage(descriptor: MessageDescriptor, values?: Record<string, PrimitiveType | React.ReactElement | FormatXMLElementFn<T>>): string | React.ReactNodeArray;
+    formatMessage(descriptor: MessageDescriptor, values?: Record<string, PrimitiveType | React.ReactElement | FormatXMLElementFn<T, R>>): string | React.ReactNodeArray;
     formatList(values: Array<string>, opts?: FormatListOptions): string;
     formatList(values: Array<string | React.ReactNode>, opts?: FormatListOptions): React.ReactNode;
     formatDisplayName(value: Parameters<DisplayNames['of']>[0], opts?: FormatDisplayNameOptions): string | undefined;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-intl",
-  "version": "4.2.2",
+  "version": "4.5.0",
   "description": "Internationalize React apps. This library provides React components and an API to format dates, numbers, and strings, including pluralization and handling translations.",
   "keywords": [
     "intl",
@@ -131,17 +131,17 @@
   "types": "./lib/react-intl.d.ts",
   "sideEffects": false,
   "dependencies": {
-    "@formatjs/intl-displaynames": "^1.2.2",
-    "@formatjs/intl-listformat": "^1.4.2",
-    "@formatjs/intl-relativetimeformat": "^4.5.10",
-    "@formatjs/intl-unified-numberformat": "^3.3.0",
-    "@formatjs/intl-utils": "^2.2.0",
+    "@formatjs/intl-displaynames": "^1.2.5",
+    "@formatjs/intl-listformat": "^1.4.4",
+    "@formatjs/intl-relativetimeformat": "^4.5.12",
+    "@formatjs/intl-unified-numberformat": "^3.3.3",
+    "@formatjs/intl-utils": "^2.2.2",
     "@types/hoist-non-react-statics": "^3.3.1",
     "@types/invariant": "^2.2.31",
     "hoist-non-react-statics": "^3.3.2",
-    "intl-format-cache": "^4.2.22",
-    "intl-messageformat": "^8.2.3",
-    "intl-messageformat-parser": "^4.1.1",
+    "intl-format-cache": "^4.2.24",
+    "intl-messageformat": "^8.3.7",
+    "intl-messageformat-parser": "^5.0.0",
     "shallow-equal": "^1.2.1"
   },
   "peerDependencies": {
@@ -152,52 +152,48 @@
     "@babel/node": "^7.8.7",
     "@babel/plugin-proposal-class-properties": "^7.8.3",
     "@babel/plugin-transform-modules-commonjs": "^7.9.0",
-    "@babel/preset-env": "^7.9.0",
-    "@babel/preset-react": "^7.9.1",
-    "@formatjs/intl-pluralrules": "^1.5.3",
-    "@microsoft/api-documenter": "^7.7.14",
-    "@microsoft/api-extractor": "^7.7.10",
+    "@babel/preset-env": "^7.9.5",
+    "@babel/preset-react": "^7.9.4",
+    "@formatjs/intl-pluralrules": "^1.5.5",
+    "@microsoft/api-documenter": "^7.7.18",
+    "@microsoft/api-extractor": "^7.7.13",
     "@types/benchmark": "^1.0.31",
     "@types/enzyme": "^3.10.5",
-    "@types/jest": "^25.1.4",
+    "@types/jest": "^25.2.1",
     "@types/prop-types": "^15.7.3",
-    "@types/react": "^16.9.25",
-    "@types/react-dom": "^16.9.5",
-    "@typescript-eslint/eslint-plugin": "^2.24.0",
-    "@typescript-eslint/parser": "^2.24.0",
-    "babel-jest": "^25.1.0",
+    "@types/react": "^16.9.34",
+    "@types/react-dom": "^16.9.6",
+    "babel-jest": "^25.4.0",
     "benchmark": "^2.1.4",
-    "core-js": "^3.6.4",
+    "core-js": "^3.6.5",
     "cross-env": "^7.0.2",
     "enzyme": "^3.11.0",
     "enzyme-adapter-react-16": "^1.15.2",
     "enzyme-to-json": "^3.4.4",
-    "eslint": "^6.8.0",
-    "eslint-plugin-react": "^7.19.0",
     "fs-extra": "^9.0.0",
     "full-icu": "^1.3.1",
     "glob": "^7.1.6",
-    "jest": "^25.1.0",
+    "jest": "^25.4.0",
     "markdown-toc": "^1.2.0",
-    "mkdirp": "^1.0.3",
+    "mkdirp": "^1.0.4",
     "parcel": "^1.12.4",
     "pre-commit": "^1.2.2",
-    "prettier": "^1.19.1",
+    "prettier": "^2.0.0",
     "react": "^16.13.1",
     "react-dom": "^16.13.1",
     "rimraf": "^3.0.2",
-    "rollup": "^2.1.0",
+    "rollup": "^2.6.1",
     "rollup-plugin-babel": "^4.4.0",
     "rollup-plugin-commonjs": "^10.1.0",
     "rollup-plugin-node-resolve": "^5.2.0",
     "rollup-plugin-replace": "^2.2.0",
-    "rollup-plugin-typescript2": "^0.26.0",
+    "rollup-plugin-typescript2": "^0.27.0",
     "rollup-plugin-uglify": "^6.0.4",
     "standard-version": "^7.1.0",
-    "ts-jest": "^25.2.1",
-    "ts-node": "^8.7.0",
+    "ts-jest": "^25.4.0",
+    "ts-node": "^8.8.2",
     "tslib": "^1.11.1",
-    "typescript": "^3.8.3"
+    "typescript": "3.8"
   },
   "scripts": {
     "benchmark": "cross-env NODE_ENV=production TS_NODE_PROJECT=./tsconfig.cjs.json ts-node test/perf/index.tsx",
@@ -209,14 +205,12 @@
     "build": "npm run build:lib && npm run build:dts && npm run build:dist",
     "clean": "rimraf coverage/ dist/ lib/ core.js core.d.ts",
     "example": "parcel examples/index.html",
-    "format:fix": "prettier --write {src,scripts,test,docs,examples}/**/*.{js,md,jsx,ts,tsx}",
-    "format": "npm run format:fix -- --check",
-    "lint:fix": "eslint src --ext .ts,.tsx --fix",
-    "lint": "eslint src --ext .ts,.tsx",
-    "postchangelog": "npm run toc && npm run format:fix",
+    "prettier": "prettier --write \"{src,scripts,test,docs,examples}/**/*\"",
+    "prettier:check": "prettier \"{src,scripts,test,docs,examples}/**/*\" --check",
+    "postchangelog": "npm run toc && npm run prettier",
     "prerelease": "npm run clean && npm run build && npm run test:all",
     "release": "standard-version",
-    "test:all": "npm run lint && npm run format && npm run test",
+    "test:all": "npm run prettier:check && npm run test",
     "test:perf": "cross-env NODE_ENV=production babel-node test/perf",
     "test:watch": "cross-env NODE_ICU_DATA=./node_modules/full-icu jest --watch",
     "test": "cross-env TZ=UTC NODE_ICU_DATA=./node_modules/full-icu jest --coverage --verbose",
@@ -224,8 +218,7 @@
   },
   "pre-commit": [
     "toc",
-    "format:fix",
-    "lint:fix"
+    "prettier"
   ],
   "browserslist": [
     "ie 11"