react-intl 3.9.1 → 3.11.0

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

@@ -107,6 +107,10 @@ export interface IntlFormatters {
     descriptor: MessageDescriptor,
     values?: Record<string, PrimitiveType>
   ): React.ReactNode;
+  formatList(
+    values: Array<string>,
+    opts?: FormatListOptions
+  ): string;
   formatList(
     values: Array<string | React.ReactNode>,
     opts?: FormatListOptions
@@ -148,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. ' +