react-intl 2.6.0 → 2.8.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-intl",
-  "version": "2.6.0",
+  "version": "2.8.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",
@@ -99,7 +99,7 @@
     "expect": "^1.9.0",
     "expect-jsx": "^3.0.0",
     "express": "^4.13.3",
-    "formatjs-extract-cldr-data": "^4.0.0",
+    "formatjs-extract-cldr-data": "^6.0.0",
     "glob": "^7.0.0",
     "intl": "^1.2.1",
     "intl-messageformat-parser": "^1.2.0",

package/src/components/provider.js

@@ -11,7 +11,12 @@ import IntlRelativeFormat from 'intl-relativeformat';
 import IntlPluralFormat from '../plural';
 import memoizeIntlConstructor from 'intl-format-cache';
 import invariant from 'invariant';
-import {shouldIntlComponentUpdate, filterProps} from '../utils';
+import {
+  createError,
+  defaultErrorHandler,
+  shouldIntlComponentUpdate,
+  filterProps,
+} from '../utils';
 import {intlConfigPropTypes, intlFormatPropTypes, intlShape} from '../types';
 import * as format from '../format';
 import {hasLocaleData} from '../locale-data-registry';
@@ -29,6 +34,8 @@ const defaultProps = {
 
   defaultLocale: 'en',
   defaultFormats: {},
+
+  onError: defaultErrorHandler,
 };
 
 export default class IntlProvider extends Component {
@@ -84,7 +91,8 @@ export default class IntlProvider extends Component {
         getRelativeFormat: memoizeIntlConstructor(IntlRelativeFormat),
         getPluralFormat: memoizeIntlConstructor(IntlPluralFormat),
       },
-    } = intlContext || {};
+    } =
+      intlContext || {};
 
     this.state = {
       ...formatters,
@@ -113,14 +121,14 @@ export default class IntlProvider extends Component {
     }
 
     if (!hasLocaleData(config.locale)) {
-      const {locale, defaultLocale, defaultFormats} = config;
+      const {locale, defaultLocale, defaultFormats, onError} = config;
 
-      if (process.env.NODE_ENV !== 'production') {
-        console.error(
-          `[React Intl] Missing locale data for locale: "${locale}". ` +
+      onError(
+        createError(
+          `Missing locale data for locale: "${locale}". ` +
             `Using default locale: "${defaultLocale}" as fallback.`
-        );
-      }
+        )
+      );
 
       // Since there's no registered locale data for `locale`, this will
       // fallback to the `defaultLocale` to make sure things can render.

package/src/en.js

@@ -1,2 +1,2 @@
 // GENERATED FILE
-export default {"locale":"en","pluralRuleFunction":function(n,ord){var s=String(n).split("."),v0=!s[1],t0=Number(s[0])==n,n10=t0&&s[0].slice(-1),n100=t0&&s[0].slice(-2);if(ord)return n10==1&&n100!=11?"one":n10==2&&n100!=12?"two":n10==3&&n100!=13?"few":"other";return n==1&&v0?"one":"other"},"fields":{"year":{"displayName":"year","relative":{"0":"this year","1":"next year","-1":"last year"},"relativeTime":{"future":{"one":"in {0} year","other":"in {0} years"},"past":{"one":"{0} year ago","other":"{0} years ago"}}},"month":{"displayName":"month","relative":{"0":"this month","1":"next month","-1":"last month"},"relativeTime":{"future":{"one":"in {0} month","other":"in {0} months"},"past":{"one":"{0} month ago","other":"{0} months ago"}}},"day":{"displayName":"day","relative":{"0":"today","1":"tomorrow","-1":"yesterday"},"relativeTime":{"future":{"one":"in {0} day","other":"in {0} days"},"past":{"one":"{0} day ago","other":"{0} days ago"}}},"hour":{"displayName":"hour","relative":{"0":"this hour"},"relativeTime":{"future":{"one":"in {0} hour","other":"in {0} hours"},"past":{"one":"{0} hour ago","other":"{0} hours ago"}}},"minute":{"displayName":"minute","relative":{"0":"this minute"},"relativeTime":{"future":{"one":"in {0} minute","other":"in {0} minutes"},"past":{"one":"{0} minute ago","other":"{0} minutes ago"}}},"second":{"displayName":"second","relative":{"0":"now"},"relativeTime":{"future":{"one":"in {0} second","other":"in {0} seconds"},"past":{"one":"{0} second ago","other":"{0} seconds ago"}}}}};
+export default {"locale":"en","pluralRuleFunction":function (n,ord){var s=String(n).split("."),v0=!s[1],t0=Number(s[0])==n,n10=t0&&s[0].slice(-1),n100=t0&&s[0].slice(-2);if(ord)return n10==1&&n100!=11?"one":n10==2&&n100!=12?"two":n10==3&&n100!=13?"few":"other";return n==1&&v0?"one":"other"},"fields":{"year":{"displayName":"year","relative":{"0":"this year","1":"next year","-1":"last year"},"relativeTime":{"future":{"one":"in {0} year","other":"in {0} years"},"past":{"one":"{0} year ago","other":"{0} years ago"}}},"year-short":{"displayName":"yr.","relative":{"0":"this yr.","1":"next yr.","-1":"last yr."},"relativeTime":{"future":{"one":"in {0} yr.","other":"in {0} yr."},"past":{"one":"{0} yr. ago","other":"{0} yr. ago"}}},"month":{"displayName":"month","relative":{"0":"this month","1":"next month","-1":"last month"},"relativeTime":{"future":{"one":"in {0} month","other":"in {0} months"},"past":{"one":"{0} month ago","other":"{0} months ago"}}},"month-short":{"displayName":"mo.","relative":{"0":"this mo.","1":"next mo.","-1":"last mo."},"relativeTime":{"future":{"one":"in {0} mo.","other":"in {0} mo."},"past":{"one":"{0} mo. ago","other":"{0} mo. ago"}}},"day":{"displayName":"day","relative":{"0":"today","1":"tomorrow","-1":"yesterday"},"relativeTime":{"future":{"one":"in {0} day","other":"in {0} days"},"past":{"one":"{0} day ago","other":"{0} days ago"}}},"day-short":{"displayName":"day","relative":{"0":"today","1":"tomorrow","-1":"yesterday"},"relativeTime":{"future":{"one":"in {0} day","other":"in {0} days"},"past":{"one":"{0} day ago","other":"{0} days ago"}}},"hour":{"displayName":"hour","relative":{"0":"this hour"},"relativeTime":{"future":{"one":"in {0} hour","other":"in {0} hours"},"past":{"one":"{0} hour ago","other":"{0} hours ago"}}},"hour-short":{"displayName":"hr.","relative":{"0":"this hour"},"relativeTime":{"future":{"one":"in {0} hr.","other":"in {0} hr."},"past":{"one":"{0} hr. ago","other":"{0} hr. ago"}}},"minute":{"displayName":"minute","relative":{"0":"this minute"},"relativeTime":{"future":{"one":"in {0} minute","other":"in {0} minutes"},"past":{"one":"{0} minute ago","other":"{0} minutes ago"}}},"minute-short":{"displayName":"min.","relative":{"0":"this minute"},"relativeTime":{"future":{"one":"in {0} min.","other":"in {0} min."},"past":{"one":"{0} min. ago","other":"{0} min. ago"}}},"second":{"displayName":"second","relative":{"0":"now"},"relativeTime":{"future":{"one":"in {0} second","other":"in {0} seconds"},"past":{"one":"{0} second ago","other":"{0} seconds ago"}}},"second-short":{"displayName":"sec.","relative":{"0":"now"},"relativeTime":{"future":{"one":"in {0} sec.","other":"in {0} sec."},"past":{"one":"{0} sec. ago","other":"{0} sec. ago"}}}}};

package/src/format.js

@@ -6,6 +6,7 @@
 
 import invariant from 'invariant';
 import IntlRelativeFormat from 'intl-relativeformat';
+import {isValidElement} from 'react';
 
 import {
   dateTimeFormatPropTypes,
@@ -14,7 +15,7 @@ import {
   pluralFormatPropTypes,
 } from './types';
 
-import {escape, filterProps} from './utils';
+import {createError, defaultErrorHandler, escape, filterProps} from './utils';
 
 const DATE_TIME_FORMAT_OPTIONS = Object.keys(dateTimeFormatPropTypes);
 const NUMBER_FORMAT_OPTIONS = Object.keys(numberFormatPropTypes);
@@ -45,25 +46,24 @@ function updateRelativeFormatThresholds(newThresholds) {
   } = newThresholds);
 }
 
-function getNamedFormat(formats, type, name) {
+function getNamedFormat(formats, type, name, onError) {
   let format = formats && formats[type] && formats[type][name];
   if (format) {
     return format;
   }
 
-  if (process.env.NODE_ENV !== 'production') {
-    console.error(`[React Intl] No ${type} format named: ${name}`);
-  }
+  onError(createError(`No ${type} format named: ${name}`));
 }
 
 export function formatDate(config, state, value, options = {}) {
   const {locale, formats, timeZone} = config;
   const {format} = options;
 
+  let onError = config.onError || defaultErrorHandler;
   let date = new Date(value);
   let defaults = {
     ...(timeZone && {timeZone}),
-    ...(format && getNamedFormat(formats, 'date', format)),
+    ...(format && getNamedFormat(formats, 'date', format, onError)),
   };
   let filteredOptions = filterProps(
     options,
@@ -74,9 +74,7 @@ export function formatDate(config, state, value, options = {}) {
   try {
     return state.getDateTimeFormat(locale, filteredOptions).format(date);
   } catch (e) {
-    if (process.env.NODE_ENV !== 'production') {
-      console.error(`[React Intl] Error formatting date.\n${e}`);
-    }
+    onError(createError('Error formatting date.', e));
   }
 
   return String(date);
@@ -86,10 +84,11 @@ export function formatTime(config, state, value, options = {}) {
   const {locale, formats, timeZone} = config;
   const {format} = options;
 
+  let onError = config.onError || defaultErrorHandler;
   let date = new Date(value);
   let defaults = {
     ...(timeZone && {timeZone}),
-    ...(format && getNamedFormat(formats, 'time', format)),
+    ...(format && getNamedFormat(formats, 'time', format, onError)),
   };
   let filteredOptions = filterProps(
     options,
@@ -109,9 +108,7 @@ export function formatTime(config, state, value, options = {}) {
   try {
     return state.getDateTimeFormat(locale, filteredOptions).format(date);
   } catch (e) {
-    if (process.env.NODE_ENV !== 'production') {
-      console.error(`[React Intl] Error formatting time.\n${e}`);
-    }
+    onError(createError('Error formatting time.', e));
   }
 
   return String(date);
@@ -121,9 +118,10 @@ export function formatRelative(config, state, value, options = {}) {
   const {locale, formats} = config;
   const {format} = options;
 
+  let onError = config.onError || defaultErrorHandler;
   let date = new Date(value);
   let now = new Date(options.now);
-  let defaults = format && getNamedFormat(formats, 'relative', format);
+  let defaults = format && getNamedFormat(formats, 'relative', format, onError);
   let filteredOptions = filterProps(options, RELATIVE_FORMAT_OPTIONS, defaults);
 
   // Capture the current threshold values, then temporarily override them with
@@ -136,9 +134,7 @@ export function formatRelative(config, state, value, options = {}) {
       now: isFinite(now) ? now : state.now(),
     });
   } catch (e) {
-    if (process.env.NODE_ENV !== 'production') {
-      console.error(`[React Intl] Error formatting relative time.\n${e}`);
-    }
+    onError(createError('Error formatting relative time.', e));
   } finally {
     updateRelativeFormatThresholds(oldThresholds);
   }
@@ -150,15 +146,14 @@ export function formatNumber(config, state, value, options = {}) {
   const {locale, formats} = config;
   const {format} = options;
 
-  let defaults = format && getNamedFormat(formats, 'number', format);
+  let onError = config.onError || defaultErrorHandler;
+  let defaults = format && getNamedFormat(formats, 'number', format, onError);
   let filteredOptions = filterProps(options, NUMBER_FORMAT_OPTIONS, defaults);
 
   try {
     return state.getNumberFormat(locale, filteredOptions).format(value);
   } catch (e) {
-    if (process.env.NODE_ENV !== 'production') {
-      console.error(`[React Intl] Error formatting number.\n${e}`);
-    }
+    onError(createError('Error formatting number.', e));
   }
 
   return String(value);
@@ -168,13 +163,12 @@ export function formatPlural(config, state, value, options = {}) {
   const {locale} = config;
 
   let filteredOptions = filterProps(options, PLURAL_FORMAT_OPTIONS);
+  let onError = config.onError || defaultErrorHandler;
 
   try {
     return state.getPluralFormat(locale, filteredOptions).format(value);
   } catch (e) {
-    if (process.env.NODE_ENV !== 'production') {
-      console.error(`[React Intl] Error formatting plural.\n${e}`);
-    }
+    onError(createError('Error formatting plural.', e));
   }
 
   return 'other';
@@ -190,6 +184,12 @@ export function formatMessage(
 
   const {id, defaultMessage} = messageDescriptor;
 
+  // Produce a better error if the user calls `intl.formatMessage(element)`
+  if (process.env.NODE_ENV !== 'production') {
+      invariant(!isValidElement(config), '[React Intl] Don\'t pass React elements to ' +
+          'formatMessage(), pass `.props`.');
+  }
+
   // `id` is a required field of a Message Descriptor.
   invariant(id, '[React Intl] An `id` must be provided to format a message.');
 
@@ -203,6 +203,7 @@ export function formatMessage(
   }
 
   let formattedMessage;
+  let onError = config.onError || defaultErrorHandler;
 
   if (message) {
     try {
@@ -210,28 +211,28 @@ export function formatMessage(
 
       formattedMessage = formatter.format(values);
     } catch (e) {
-      if (process.env.NODE_ENV !== 'production') {
-        console.error(
-          `[React Intl] Error formatting message: "${id}" for locale: "${locale}"` +
-            (defaultMessage ? ', using default message as fallback.' : '') +
-            `\n${e}`
-        );
-      }
+      onError(
+        createError(
+          `Error formatting message: "${id}" for locale: "${locale}"` +
+            (defaultMessage ? ', using default message as fallback.' : ''),
+          e
+        )
+      );
     }
   } else {
-    if (process.env.NODE_ENV !== 'production') {
-      // This prevents warnings from littering the console in development
-      // when no `messages` are passed into the <IntlProvider> for the
-      // default locale, and a default message is in the source.
-      if (
-        !defaultMessage ||
-        (locale && locale.toLowerCase() !== defaultLocale.toLowerCase())
-      ) {
-        console.error(
-          `[React Intl] Missing message: "${id}" for locale: "${locale}"` +
+    // This prevents warnings from littering the console in development
+    // when no `messages` are passed into the <IntlProvider> for the
+    // default locale, and a default message is in the source.
+    if (
+      !defaultMessage ||
+      (locale && locale.toLowerCase() !== defaultLocale.toLowerCase())
+    ) {
+      onError(
+        createError(
+          `Missing message: "${id}" for locale: "${locale}"` +
             (defaultMessage ? ', using default message as fallback.' : '')
-        );
-      }
+        )
+      );
     }
   }
 
@@ -245,24 +246,21 @@ export function formatMessage(
 
       formattedMessage = formatter.format(values);
     } catch (e) {
-      if (process.env.NODE_ENV !== 'production') {
-        console.error(
-          `[React Intl] Error formatting the default message for: "${id}"` +
-            `\n${e}`
-        );
-      }
+      onError(
+        createError(`Error formatting the default message for: "${id}"`, e)
+      );
     }
   }
 
   if (!formattedMessage) {
-    if (process.env.NODE_ENV !== 'production') {
-      console.error(
-        `[React Intl] Cannot format message: "${id}", ` +
-          `using message ${
-            message || defaultMessage ? 'source' : 'id'
-          } as fallback.`
-      );
-    }
+    onError(
+      createError(
+        `Cannot format message: "${id}", ` +
+          `using message ${message || defaultMessage
+            ? 'source'
+            : 'id'} as fallback.`
+      )
+    );
   }
 
   return formattedMessage || message || defaultMessage || id;

package/src/inject.js

@@ -42,7 +42,7 @@ export default function injectIntl(WrappedComponent, options = {}) {
           '`injectIntl()`'
       );
 
-      return this.refs.wrappedInstance;
+      return this._wrappedInstance;
     }
 
     render() {
@@ -50,7 +50,7 @@ export default function injectIntl(WrappedComponent, options = {}) {
         <WrappedComponent
           {...this.props}
           {...{[intlPropName]: this.context.intl}}
-          ref={withRef ? 'wrappedInstance' : null}
+          ref={withRef ? /* istanbul ignore next */ (ref => this._wrappedInstance = ref) : null}
         />
       );
     }

package/src/types.js

@@ -31,6 +31,8 @@ export const intlConfigPropTypes = {
 
   defaultLocale: string,
   defaultFormats: object,
+
+  onError: func,
 };
 
 export const intlFormatPropTypes = {

package/src/utils.js

@@ -101,3 +101,14 @@ export function shouldIntlComponentUpdate(
     )
   );
 }
+
+export function createError(message, exception) {
+  const eMsg = exception ? `\n${exception}` : '';
+  return `[React Intl] ${message}${eMsg}`;
+}
+
+export function defaultErrorHandler(error) {
+  if (process.env.NODE_ENV !== 'production') {
+    console.error(error);
+  }
+}

package/yarn.lock

@@ -1166,17 +1166,20 @@ circular-json@^0.3.1:
   version "0.3.1"
   resolved "https://registry.yarnpkg.com/circular-json/-/circular-json-0.3.1.tgz#be8b36aefccde8b3ca7aa2d6afc07a37242c0d2d"
 
-cldr-core@^31.0.1:
-  version "31.0.1"
-  resolved "https://registry.yarnpkg.com/cldr-core/-/cldr-core-31.0.1.tgz#24b3d59359ef890595665e5a8ca29e53901c6d54"
+cldr-core@^34.0.0:
+  version "34.0.0"
+  resolved "https://registry.yarnpkg.com/cldr-core/-/cldr-core-34.0.0.tgz#2e9d1f9909868e93e70c4813a74f331af028d66c"
+  integrity sha512-PFHHn2SlqRdqD1ZC8Ddw5ZOSwJdqsmTY6fnOVsX5iMfOShqXs7QhpkIo4eOvz7rFdEivp/IrMDPs47Z4z1rD3g==
 
-cldr-dates-full@^31.0.1:
-  version "31.0.1"
-  resolved "https://registry.yarnpkg.com/cldr-dates-full/-/cldr-dates-full-31.0.1.tgz#c49a4740250646148cfb55e02f20d7ae2c917f89"
+cldr-dates-full@^34.0.0:
+  version "34.0.0"
+  resolved "https://registry.yarnpkg.com/cldr-dates-full/-/cldr-dates-full-34.0.0.tgz#e2f9c254ab7d6b0a5d28481737138530eebb3be6"
+  integrity sha512-mKGQF16YAEeMOlTA1oT8vWOnm2VuCE1yGQQN7CbnKirVhXigoa0uUiOwjajCZSVpLMyTwWi8AvlY1pjNlX6uRw==
 
-cldr-numbers-full@^31.0.1:
-  version "31.0.1"
-  resolved "https://registry.yarnpkg.com/cldr-numbers-full/-/cldr-numbers-full-31.0.1.tgz#a78774e1544fbf9616d8f6812a312b10f4aaafbe"
+cldr-numbers-full@^34.0.0:
+  version "34.0.0"
+  resolved "https://registry.yarnpkg.com/cldr-numbers-full/-/cldr-numbers-full-34.0.0.tgz#f9e62bd4dda1fb4e17c7a3e4b170da2263f43dac"
+  integrity sha512-+Bqxnym5Fv81u/iBoZvy2dUfPQdAc4KbX4QDptq9PLx846iQkRN0UKo3t5xZu97rUlRw2fFGaRt+KO6iMPo+RA==
 
 cli-cursor@^1.0.1:
   version "1.0.2"
@@ -2064,13 +2067,14 @@ form-data@^2.1.1, form-data@~2.1.1:
     combined-stream "^1.0.5"
     mime-types "^2.1.12"
 
-formatjs-extract-cldr-data@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/formatjs-extract-cldr-data/-/formatjs-extract-cldr-data-4.0.0.tgz#72b8c36f92a855989a381fa6c194566b34a1539f"
+formatjs-extract-cldr-data@^6.0.0:
+  version "6.0.0"
+  resolved "https://registry.yarnpkg.com/formatjs-extract-cldr-data/-/formatjs-extract-cldr-data-6.0.0.tgz#f05b6fe758ae109c1ee0b33c0c17781fe9cfb29b"
+  integrity sha512-5AldF5PJMDi9Offq59NP7pswzEj3+ThiZcZY0mJ0DZINn3TZHrjx7jwewb4+G6c+3fTLt7KVl9SGc8qpet8j5w==
   dependencies:
-    cldr-core "^31.0.1"
-    cldr-dates-full "^31.0.1"
-    cldr-numbers-full "^31.0.1"
+    cldr-core "^34.0.0"
+    cldr-dates-full "^34.0.0"
+    cldr-numbers-full "^34.0.0"
     glob "^5.0.1"
     make-plural "^2.1.3"
     object.assign "^4.0.3"