react-intl 3.10.0 → 3.11.0

package/dist/types.d.ts

@@ -60,7 +60,7 @@ export interface IntlCache {
     list: Record<string, IntlListFormat>;
 }
 export interface MessageDescriptor {
-    id?: string;
+    id?: string | number;
     description?: string | object;
     defaultMessage?: string;
 }

package/dist/utils.d.ts

@@ -2,7 +2,7 @@ import { IntlConfig, IntlCache, CustomFormats, Formatters } from './types';
 import { IntlRelativeTimeFormatOptions } from '@formatjs/intl-relativetimeformat';
 export declare function escape(str: string): string;
 export declare function filterProps<T extends Record<string, any>, K extends string>(props: T, whitelist: Array<K>, defaults?: Partial<T>): Pick<T, K>;
-export declare function invariantIntlContext(intl?: any): void;
+export declare function invariantIntlContext(intl?: any): asserts intl;
 export declare function createError(message: string, exception?: Error): string;
 export declare function defaultErrorHandler(error: string): void;
 export declare const DEFAULT_INTL_CONFIG: Pick<IntlConfig, 'formats' | 'messages' | 'timeZone' | 'textComponent' | 'defaultLocale' | 'defaultFormats' | 'onError'>;

package/dist/utils.js

@@ -13,12 +13,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 var React = require("react");
 var intl_messageformat_1 = require("intl-messageformat");
 var intl_format_cache_1 = require("intl-format-cache");
-// Since rollup cannot deal with namespace being a function,
-// this is to interop with TypeScript since `invariant`
-// does not export a default
-// https://github.com/rollup/rollup/issues/1267
-var invariant_ = require("invariant");
-var invariant = invariant_.default || invariant_;
+var intl_utils_1 = require("@formatjs/intl-utils");
 var ESCAPED_CHARS = {
     38: '&',
     62: '>',
@@ -45,7 +40,7 @@ function filterProps(props, whitelist, defaults) {
 }
 exports.filterProps = filterProps;
 function invariantIntlContext(intl) {
-    invariant(intl, '[React Intl] Could not find required `intl` object. ' +
+    intl_utils_1.invariant(intl, '[React Intl] Could not find required `intl` object. ' +
         '<IntlProvider> needs to exist in the component ancestry.');
 }
 exports.invariantIntlContext = invariantIntlContext;

package/lib/components/relative.js

@@ -6,12 +6,7 @@
 import * as React from 'react';
 import { Context } from './injectIntl';
 import { invariantIntlContext } from '../utils';
-// Since rollup cannot deal with namespace being a function,
-// this is to interop with TypeScript since `invariant`
-// does not export a default
-// https://github.com/rollup/rollup/issues/1267
-import * as invariant_ from 'invariant';
-const invariant = invariant_.default || invariant_;
+import { invariant } from '@formatjs/intl-utils';
 const MINUTE = 60;
 const HOUR = 60 * 60;
 const DAY = 60 * 60 * 24;
@@ -57,9 +52,6 @@ const INCREMENTABLE_UNITS = ['second', 'minute', 'hour'];
 function canIncrement(unit = 'second') {
     return INCREMENTABLE_UNITS.includes(unit);
 }
-function verifyProps(updateIntervalInSeconds, unit) {
-    invariant(!updateIntervalInSeconds || (updateIntervalInSeconds && canIncrement(unit)), 'Cannot schedule update with unit longer than hour');
-}
 export class FormattedRelativeTime extends React.PureComponent {
     constructor(props) {
         super(props);
@@ -72,7 +64,8 @@ export class FormattedRelativeTime extends React.PureComponent {
                 ? valueToSeconds(this.props.value, this.props.unit)
                 : 0,
         };
-        verifyProps(props.updateIntervalInSeconds, props.unit);
+        invariant(!props.updateIntervalInSeconds ||
+            !!(props.updateIntervalInSeconds && canIncrement(props.unit)), 'Cannot schedule update with unit longer than hour');
     }
     scheduleNextUpdate({ updateIntervalInSeconds, unit }, { currentValueInSeconds }) {
         clearTimeout(this._updateTimer);

package/lib/formatters/message.d.ts

@@ -1,5 +1,6 @@
 import * as React from 'react';
 import { Formatters, IntlConfig, MessageDescriptor } from '../types';
 import { PrimitiveType } from 'intl-messageformat';
+export declare const prepareIntlMessageFormatHtmlOutput: (chunks: (string | object)[]) => 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>)>;
 export declare function formatMessage({ locale, formats, messages, defaultLocale, defaultFormats, onError, }: Pick<IntlConfig, 'locale' | 'formats' | 'messages' | 'defaultLocale' | 'defaultFormats' | 'onError'>, state: Formatters, messageDescriptor?: MessageDescriptor, values?: Record<string, PrimitiveType>): string;
 export declare function formatHTMLMessage(config: Pick<IntlConfig, 'locale' | 'formats' | 'messages' | 'defaultLocale' | 'defaultFormats' | 'onError'>, state: Formatters, messageDescriptor?: MessageDescriptor, rawValues?: Record<string, PrimitiveType>): React.ReactNode;

package/lib/formatters/message.js

@@ -3,12 +3,8 @@
  * Copyrights licensed under the New BSD License.
  * See the accompanying LICENSE file for terms.
  */
-// Since rollup cannot deal with namespace being a function,
-// this is to interop with TypeScript since `invariant`
-// does not export a default
-// https://github.com/rollup/rollup/issues/1267
-import * as invariant_ from 'invariant';
-const invariant = invariant_.default || invariant_;
+import * as React from 'react';
+import { invariant } from '@formatjs/intl-utils';
 import { createError, escape } from '../utils';
 import IntlMessageFormat from 'intl-messageformat';
 function setTimeZoneInOptions(opts, timeZone) {
@@ -31,14 +27,12 @@ function deepMergeFormatsAndSetTimeZone(f1, timeZone) {
     const mfFormats = IntlMessageFormat.formats;
     return Object.assign(Object.assign(Object.assign({}, mfFormats), f1), { date: deepMergeOptions(setTimeZoneInOptions(mfFormats.date, timeZone), setTimeZoneInOptions(f1.date || {}, timeZone)), time: deepMergeOptions(setTimeZoneInOptions(mfFormats.time, timeZone), setTimeZoneInOptions(f1.time || {}, timeZone)) });
 }
+export const prepareIntlMessageFormatHtmlOutput = (chunks) => React.createElement(React.Fragment, null, ...chunks);
 export function formatMessage({ locale, formats, messages, defaultLocale, defaultFormats, onError, timeZone, }, state, messageDescriptor = { id: '' }, values = {}) {
     const { id, defaultMessage } = messageDescriptor;
     // `id` is a required field of a Message Descriptor.
-    invariant(id, '[React Intl] An `id` must be provided to format a message.');
-    if (!id) {
-        throw new Error('[React Intl] An `id` must be provided to format a message.');
-    }
-    const message = messages && messages[id];
+    invariant(!!id, '[React Intl] An `id` must be provided to format a message.');
+    const message = messages && messages[String(id)];
     formats = deepMergeFormatsAndSetTimeZone(formats, timeZone);
     defaultFormats = deepMergeFormatsAndSetTimeZone(defaultFormats, timeZone);
     let formattedMessageParts = [];
@@ -77,15 +71,15 @@ export function formatMessage({ locale, formats, messages, defaultLocale, defaul
         onError(createError(`Cannot format message: "${id}", ` +
             `using message ${message || defaultMessage ? 'source' : 'id'} as fallback.`));
         if (typeof message === 'string') {
-            return message || defaultMessage || id;
+            return message || defaultMessage || String(id);
         }
-        return defaultMessage || id;
+        return defaultMessage || String(id);
     }
     if (formattedMessageParts.length === 1 &&
         typeof formattedMessageParts[0] === 'string') {
-        return formattedMessageParts[0] || defaultMessage || id;
+        return formattedMessageParts[0] || defaultMessage || String(id);
     }
-    return formattedMessageParts;
+    return prepareIntlMessageFormatHtmlOutput(formattedMessageParts);
 }
 export function formatHTMLMessage(config, state, messageDescriptor = { id: '' }, rawValues = {}) {
     // Process all the values before they are used when formatting the ICU

package/lib/react-intl.d.ts

@@ -187,7 +187,7 @@ export declare interface IntlShape extends IntlConfig, IntlFormatters {
 }
 
 export declare interface MessageDescriptor {
-    id?: string;
+    id?: string | number;
     description?: string | object;
     defaultMessage?: string;
 }

package/lib/tsdoc-metadata.json

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

package/lib/types.d.ts

@@ -60,7 +60,7 @@ export interface IntlCache {
     list: Record<string, IntlListFormat>;
 }
 export interface MessageDescriptor {
-    id?: string;
+    id?: string | number;
     description?: string | object;
     defaultMessage?: string;
 }

package/lib/utils.d.ts

@@ -2,7 +2,7 @@ import { IntlConfig, IntlCache, CustomFormats, Formatters } from './types';
 import { IntlRelativeTimeFormatOptions } from '@formatjs/intl-relativetimeformat';
 export declare function escape(str: string): string;
 export declare function filterProps<T extends Record<string, any>, K extends string>(props: T, whitelist: Array<K>, defaults?: Partial<T>): Pick<T, K>;
-export declare function invariantIntlContext(intl?: any): void;
+export declare function invariantIntlContext(intl?: any): asserts intl;
 export declare function createError(message: string, exception?: Error): string;
 export declare function defaultErrorHandler(error: string): void;
 export declare const DEFAULT_INTL_CONFIG: Pick<IntlConfig, 'formats' | 'messages' | 'timeZone' | 'textComponent' | 'defaultLocale' | 'defaultFormats' | 'onError'>;

package/lib/utils.js

@@ -11,12 +11,7 @@ file in the root directory of React's source tree.
 import * as React from 'react';
 import IntlMessageFormat from 'intl-messageformat';
 import memoizeIntlConstructor from 'intl-format-cache';
-// Since rollup cannot deal with namespace being a function,
-// this is to interop with TypeScript since `invariant`
-// does not export a default
-// https://github.com/rollup/rollup/issues/1267
-import * as invariant_ from 'invariant';
-const invariant = invariant_.default || invariant_;
+import { invariant } from '@formatjs/intl-utils';
 const ESCAPED_CHARS = {
     38: '&',
     62: '>',

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-intl",
-  "version": "3.10.0",
+  "version": "3.11.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,18 +131,18 @@
   "types": "./lib/react-intl.d.ts",
   "sideEffects": false,
   "dependencies": {
-    "@formatjs/intl-listformat": "^1.3.2",
-    "@formatjs/intl-relativetimeformat": "^4.5.2",
-    "@formatjs/intl-unified-numberformat": "^3.0.0",
+    "@formatjs/intl-listformat": "^1.3.7",
+    "@formatjs/intl-relativetimeformat": "^4.5.7",
+    "@formatjs/intl-unified-numberformat": "^3.0.4",
+    "@formatjs/intl-utils": "^2.0.4",
     "@formatjs/macro": "^0.2.6",
     "@types/hoist-non-react-statics": "^3.3.1",
     "@types/invariant": "^2.2.31",
     "hoist-non-react-statics": "^3.3.1",
-    "intl-format-cache": "^4.2.14",
+    "intl-format-cache": "^4.2.19",
     "intl-locales-supported": "^1.8.4",
-    "intl-messageformat": "^7.7.3",
-    "intl-messageformat-parser": "^3.5.2",
-    "invariant": "^2.1.1",
+    "intl-messageformat": "^7.8.2",
+    "intl-messageformat-parser": "^3.6.2",
     "shallow-equal": "^1.2.1"
   },
   "peerDependencies": {
@@ -155,20 +155,20 @@
     "@babel/plugin-transform-modules-commonjs": "^7.7.5",
     "@babel/preset-env": "^7.7.7",
     "@babel/preset-react": "^7.7.4",
-    "@formatjs/intl-pluralrules": "^1.4.0",
-    "@microsoft/api-documenter": "^7.7.2",
-    "@microsoft/api-extractor": "^7.7.0",
+    "@formatjs/intl-pluralrules": "^1.5.0",
+    "@microsoft/api-documenter": "^7.7.3",
+    "@microsoft/api-extractor": "^7.7.1",
     "@types/benchmark": "^1.0.31",
     "@types/enzyme": "^3.10.4",
     "@types/jest": "^24.0.25",
     "@types/prop-types": "^15.7.3",
     "@types/react": "^16.9.17",
     "@types/react-dom": "^16.9.4",
-    "@typescript-eslint/eslint-plugin": "^2.13.0",
-    "@typescript-eslint/parser": "^2.13.0",
+    "@typescript-eslint/eslint-plugin": "^2.15.0",
+    "@typescript-eslint/parser": "^2.15.0",
     "babel-jest": "^24.9.0",
     "benchmark": "^2.1.0",
-    "core-js": "^3.6.1",
+    "core-js": "^3.6.2",
     "cross-env": "^6.0.3",
     "enzyme": "^3.11.0",
     "enzyme-adapter-react-16": "^1.15.2",
@@ -187,7 +187,7 @@
     "react": "^16.12.0",
     "react-dom": "^16.12.0",
     "rimraf": "^3.0.0",
-    "rollup": "^1.27.14",
+    "rollup": "^1.29.0",
     "rollup-plugin-babel": "^4.3.3",
     "rollup-plugin-commonjs": "^10.1.0",
     "rollup-plugin-node-resolve": "^5.2.0",
@@ -195,7 +195,7 @@
     "rollup-plugin-typescript2": "^0.25.3",
     "rollup-plugin-uglify": "^6.0.4",
     "standard-version": "^7.0.1",
-    "ts-jest": "^24.2.0",
+    "ts-jest": "^24.3.0",
     "ts-node": "^8.5.4",
     "tslib": "^1.9.3",
     "typescript": "^3.7.0"

package/src/components/provider.tsx

@@ -178,6 +178,6 @@ export default class IntlProvider extends React.PureComponent<
 
   render(): JSX.Element {
     invariantIntlContext(this.state.intl);
-    return <Provider value={this.state.intl!}>{this.props.children}</Provider>;
+    return <Provider value={this.state.intl}>{this.props.children}</Provider>;
   }
 }

package/src/components/relative.tsx

@@ -8,13 +8,7 @@ import {Context} from './injectIntl';
 import {FormatRelativeTimeOptions} from '../types';
 import {Unit} from '@formatjs/intl-relativetimeformat';
 import {invariantIntlContext} from '../utils';
-
-// Since rollup cannot deal with namespace being a function,
-// this is to interop with TypeScript since `invariant`
-// does not export a default
-// https://github.com/rollup/rollup/issues/1267
-import * as invariant_ from 'invariant';
-const invariant: typeof invariant_ = (invariant_ as any).default || invariant_;
+import {invariant} from '@formatjs/intl-utils';
 const MINUTE = 60;
 const HOUR = 60 * 60;
 const DAY = 60 * 60 * 24;
@@ -82,13 +76,6 @@ function canIncrement(unit: Unit = 'second'): boolean {
   return INCREMENTABLE_UNITS.includes(unit);
 }
 
-function verifyProps(updateIntervalInSeconds?: number, unit?: Unit): void {
-  invariant(
-    !updateIntervalInSeconds || (updateIntervalInSeconds && canIncrement(unit)),
-    'Cannot schedule update with unit longer than hour'
-  );
-}
-
 export class FormattedRelativeTime extends React.PureComponent<Props, State> {
   // Public for testing
   _updateTimer: any = null;
@@ -107,7 +94,11 @@ export class FormattedRelativeTime extends React.PureComponent<Props, State> {
 
   constructor(props: Props) {
     super(props);
-    verifyProps(props.updateIntervalInSeconds, props.unit);
+    invariant(
+      !props.updateIntervalInSeconds ||
+        !!(props.updateIntervalInSeconds && canIncrement(props.unit)),
+      'Cannot schedule update with unit longer than hour'
+    );
   }
 
   scheduleNextUpdate(

package/src/formatters/message.ts

@@ -5,12 +5,7 @@
  */
 
 import * as React from 'react';
-// Since rollup cannot deal with namespace being a function,
-// this is to interop with TypeScript since `invariant`
-// does not export a default
-// https://github.com/rollup/rollup/issues/1267
-import * as invariant_ from 'invariant';
-const invariant: typeof invariant_ = (invariant_ as any).default || invariant_;
+import {invariant} from '@formatjs/intl-utils';
 
 import {
   Formatters,
@@ -77,6 +72,10 @@ function deepMergeFormatsAndSetTimeZone(
   };
 }
 
+export const prepareIntlMessageFormatHtmlOutput = (
+  chunks: (string | object)[]
+): React.ReactElement => React.createElement(React.Fragment, null, ...chunks);
+
 export function formatMessage(
   {
     locale,
@@ -123,17 +122,12 @@ export function formatMessage(
     string,
     PrimitiveType | React.ReactElement | FormatXMLElementFn
   > = {}
-): string | React.ReactNodeArray {
+): string | React.ReactNodeArray | React.ReactElement {
   const {id, defaultMessage} = messageDescriptor;
 
   // `id` is a required field of a Message Descriptor.
-  invariant(id, '[React Intl] An `id` must be provided to format a message.');
-  if (!id) {
-    throw new Error(
-      '[React Intl] An `id` must be provided to format a message.'
-    );
-  }
-  const message = messages && messages[id];
+  invariant(!!id, '[React Intl] An `id` must be provided to format a message.');
+  const message = messages && messages[String(id)];
   formats = deepMergeFormatsAndSetTimeZone(formats, timeZone);
   defaultFormats = deepMergeFormatsAndSetTimeZone(defaultFormats, timeZone);
 
@@ -198,17 +192,18 @@ export function formatMessage(
       )
     );
     if (typeof message === 'string') {
-      return message || defaultMessage || id;
+      return message || defaultMessage || String(id);
     }
-    return defaultMessage || id;
+    return defaultMessage || String(id);
   }
   if (
     formattedMessageParts.length === 1 &&
     typeof formattedMessageParts[0] === 'string'
   ) {
-    return (formattedMessageParts[0] as string) || defaultMessage || id;
+    return (formattedMessageParts[0] as string) || defaultMessage || String(id);
   }
-  return formattedMessageParts;
+
+  return prepareIntlMessageFormatHtmlOutput(formattedMessageParts);
 }
 
 export function formatHTMLMessage(

package/src/types.ts

@@ -152,7 +152,7 @@ export interface IntlCache {
 }
 
 export interface MessageDescriptor {
-  id?: string;
+  id?: string | number;
   description?: string | object;
   defaultMessage?: string;
 }

package/src/utils.ts

@@ -13,13 +13,8 @@ import {IntlConfig, IntlCache, CustomFormats, Formatters} from './types';
 import * as React from 'react';
 import IntlMessageFormat from 'intl-messageformat';
 import memoizeIntlConstructor from 'intl-format-cache';
-// Since rollup cannot deal with namespace being a function,
-// this is to interop with TypeScript since `invariant`
-// does not export a default
-// https://github.com/rollup/rollup/issues/1267
-import * as invariant_ from 'invariant';
+import {invariant} from '@formatjs/intl-utils'
 import {IntlRelativeTimeFormatOptions} from '@formatjs/intl-relativetimeformat';
-const invariant: typeof invariant_ = (invariant_ as any).default || invariant_;
 
 const ESCAPED_CHARS: Record<number, string> = {
   38: '&amp;',
@@ -54,7 +49,7 @@ export function filterProps<T extends Record<string, any>, K extends string>(
   }, {} as Pick<T, K>);
 }
 
-export function invariantIntlContext(intl?: any): void {
+export function invariantIntlContext(intl?: any): asserts intl {
   invariant(
     intl,
     '[React Intl] Could not find required `intl` object. ' +