react-intl 3.12.0 → 3.12.1

package/CHANGELOG.md

@@ -2,6 +2,14 @@
 
 All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
 
+### [3.12.1](https://github.com/formatjs/react-intl/compare/v3.12.0...v3.12.1) (2020-03-04)
+
+
+### Bug Fixes
+
+* clarify err messages ([b207d80](https://github.com/formatjs/react-intl/commit/b207d805a9e5609983ac1b2ca8f9708030e12337))
+* inline defineMessages macro, fix [#1592](https://github.com/formatjs/react-intl/issues/1592) ([5ae8349](https://github.com/formatjs/react-intl/commit/5ae8349dc2ee08b54a54a2a521b8a9c052960d04))
+
 ## [3.12.0](https://github.com/formatjs/react-intl/compare/v3.11.0...v3.12.0) (2020-02-04)
 
 

package/dist/components/plural.d.ts

@@ -11,7 +11,7 @@ interface Props extends FormatPluralOptions {
     many?: React.ReactNode;
     children?(value: React.ReactNode): React.ReactElement | null;
 }
-declare const _default: React.ForwardRefExoticComponent<Pick<Props, "children" | "other" | "zero" | "one" | "two" | "few" | "many" | "format" | "localeMatcher" | "type" | "value"> & {
+declare const _default: React.ForwardRefExoticComponent<Pick<Props, "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>;

package/dist/components/provider.js

@@ -32,7 +32,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 var React = require("react");
 var injectIntl_1 = require("./injectIntl");
 var utils_1 = require("../utils");
-var intl_locales_supported_1 = require("intl-locales-supported");
 var number_1 = require("../formatters/number");
 var relativeTime_1 = require("../formatters/relativeTime");
 var dateTime_1 = require("../formatters/dateTime");
@@ -62,12 +61,10 @@ function processIntlConfig(config) {
 function createIntl(config, cache) {
     var formatters = utils_1.createFormatters(cache);
     var resolvedConfig = __assign(__assign({}, utils_1.DEFAULT_INTL_CONFIG), config);
-    if (!resolvedConfig.locale ||
-        !intl_locales_supported_1.default(resolvedConfig.locale)) {
-        var locale = resolvedConfig.locale, defaultLocale = resolvedConfig.defaultLocale, onError = resolvedConfig.onError;
-        if (typeof onError === 'function') {
-            onError(utils_1.createError("Missing locale data for locale: \"" + locale + "\". " +
-                ("Using default locale: \"" + defaultLocale + "\" as fallback.")));
+    var locale = resolvedConfig.locale, defaultLocale = resolvedConfig.defaultLocale, onError = resolvedConfig.onError;
+    if (!locale) {
+        if (onError) {
+            onError(utils_1.createError("\"locale\" was not configured, using \"" + defaultLocale + "\" as fallback. See https://github.com/formatjs/react-intl/blob/master/docs/API.md#intlshape for more details"));
         }
         // Since there's no registered locale data for `locale`, this will
         // fallback to the `defaultLocale` to make sure things can render.
@@ -76,6 +73,13 @@ function createIntl(config, cache) {
         // each <FormattedMessage> contains a `defaultMessage` prop.
         resolvedConfig.locale = resolvedConfig.defaultLocale || 'en';
     }
+    else if (!Intl.NumberFormat.supportedLocalesOf(locale).length && onError) {
+        onError(utils_1.createError("Missing locale data for locale: \"" + locale + "\" in Intl.NumberFormat. Using default locale: \"" + defaultLocale + "\" as fallback. See https://github.com/formatjs/react-intl/blob/master/docs/Getting-Started.md#runtime-requirements for more details"));
+    }
+    else if (!Intl.DateTimeFormat.supportedLocalesOf(locale).length &&
+        onError) {
+        onError(utils_1.createError("Missing locale data for locale: \"" + locale + "\" in Intl.DateTimeFormat. Using default locale: \"" + defaultLocale + "\" as fallback. See https://github.com/formatjs/react-intl/blob/master/docs/Getting-Started.md#runtime-requirements for more details"));
+    }
     return __assign(__assign({}, resolvedConfig), { formatters: formatters, formatNumber: number_1.formatNumber.bind(null, resolvedConfig, formatters.getNumberFormat), formatNumberToParts: number_1.formatNumberToParts.bind(null, resolvedConfig, formatters.getNumberFormat), formatRelativeTime: relativeTime_1.formatRelativeTime.bind(null, resolvedConfig, formatters.getRelativeTimeFormat), formatDate: dateTime_1.formatDate.bind(null, resolvedConfig, formatters.getDateTimeFormat), formatDateToParts: dateTime_1.formatDateToParts.bind(null, resolvedConfig, formatters.getDateTimeFormat), formatTime: dateTime_1.formatTime.bind(null, resolvedConfig, formatters.getDateTimeFormat), formatTimeToParts: dateTime_1.formatTimeToParts.bind(null, resolvedConfig, formatters.getDateTimeFormat), formatPlural: plural_1.formatPlural.bind(null, resolvedConfig, formatters.getPluralRules), formatMessage: message_1.formatMessage.bind(null, resolvedConfig, formatters), formatHTMLMessage: message_1.formatHTMLMessage.bind(null, resolvedConfig, formatters), formatList: list_1.formatList.bind(null, resolvedConfig, formatters.getListFormat), formatDisplayName: displayName_1.formatDisplayName.bind(null, resolvedConfig, formatters.getDisplayNames) });
 }
 exports.createIntl = createIntl;

package/dist/index.d.ts

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

package/dist/index.js

@@ -1,7 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-var macro_1 = require("@formatjs/macro");
-exports.defineMessages = macro_1.defineMessages;
+function defineMessages(msgs) {
+    return msgs;
+}
+exports.defineMessages = defineMessages;
 var createFormattedComponent_1 = require("./components/createFormattedComponent");
 var injectIntl_1 = require("./components/injectIntl");
 exports.injectIntl = injectIntl_1.default;

package/dist/react-intl.api.md

@@ -127,7 +127,7 @@ export const FormattedNumberParts: React.FC<Formatter['formatNumber'] & {
 // Warning: (ae-forgotten-export) The symbol "Props" needs to be exported by the entry point index.d.ts
 //
 // @public (undocumented)
-export const FormattedPlural: React.ForwardRefExoticComponent<Pick<Props_2, "children" | "other" | "zero" | "one" | "two" | "few" | "many" | "format" | "localeMatcher" | "type" | "value"> & {
+export 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>;

package/dist/react-intl.d.ts

@@ -126,7 +126,7 @@ export declare const FormattedNumberParts: React.FC<Formatter['formatNumber'] &
     children(val: Intl.NumberFormatPart[]): React.ReactElement | null;
 }>;
 
-export declare const FormattedPlural: React.ForwardRefExoticComponent<Pick<Props_2, "children" | "other" | "zero" | "one" | "two" | "few" | "many" | "format" | "localeMatcher" | "type" | "value"> & {
+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>;
@@ -718,17 +718,33 @@ declare enum TYPE {
 }
 
 declare type UnifiedNumberFormatOptions = Intl.NumberFormatOptions & NumberFormatDigitOptions & {
-    localeMatcher?: 'lookup' | 'best fit';
-    style?: 'decimal' | 'percent' | 'currency' | 'unit';
-    compactDisplay?: 'short' | 'long';
-    currencyDisplay?: 'symbol' | 'code' | 'name' | 'narrowSymbol';
-    currencySign?: 'standard' | 'accounting';
-    notation?: 'standard' | 'scientific' | 'engineering' | 'compact';
-    signDisplay?: 'auto' | 'always' | 'never' | 'exceptZero';
+    localeMatcher?: UnifiedNumberFormatOptionsLocaleMatcher;
+    style?: UnifiedNumberFormatOptionsStyle;
+    compactDisplay?: UnifiedNumberFormatOptionsCompactDisplay;
+    currencyDisplay?: UnifiedNumberFormatOptionsCurrencyDisplay;
+    currencySign?: UnifiedNumberFormatOptionsCurrencySign;
+    notation?: UnifiedNumberFormatOptionsNotation;
+    signDisplay?: UnifiedNumberFormatOptionsSignDisplay;
     unit?: Unit_2;
-    unitDisplay?: 'long' | 'short' | 'narrow';
+    unitDisplay?: UnifiedNumberFormatOptionsUnitDisplay;
 };
 
+declare type UnifiedNumberFormatOptionsCompactDisplay = 'short' | 'long';
+
+declare type UnifiedNumberFormatOptionsCurrencyDisplay = 'symbol' | 'code' | 'name' | 'narrowSymbol';
+
+declare type UnifiedNumberFormatOptionsCurrencySign = 'standard' | 'accounting';
+
+declare type UnifiedNumberFormatOptionsLocaleMatcher = 'lookup' | 'best fit';
+
+declare type UnifiedNumberFormatOptionsNotation = 'standard' | 'scientific' | 'engineering' | 'compact';
+
+declare type UnifiedNumberFormatOptionsSignDisplay = 'auto' | 'always' | 'never' | 'exceptZero';
+
+declare type UnifiedNumberFormatOptionsStyle = 'decimal' | 'percent' | 'currency' | 'unit';
+
+declare type UnifiedNumberFormatOptionsUnitDisplay = 'long' | 'short' | 'narrow';
+
 declare type Unit = 'second' | 'minute' | 'hour' | 'day' | 'week' | 'month' | 'quarter' | 'year';
 
 declare type Unit_2 = 'degree' | 'acre' | 'hectare' | 'percent' | 'bit' | 'byte' | 'gigabit' | 'gigabyte' | 'kilobit' | 'kilobyte' | 'megabit' | 'megabyte' | 'petabyte' | 'terabit' | 'terabyte' | 'day' | 'hour' | 'millisecond' | 'minute' | 'month' | 'second' | 'week' | 'year' | 'centimeter' | 'foot' | 'inch' | 'kilometer' | 'meter' | 'mile-scandinavian' | 'mile' | 'millimeter' | 'yard' | 'gram' | 'kilogram' | 'ounce' | 'pound' | 'stone' | 'celsius' | 'fahrenheit' | 'fluid-ounce' | 'gallon' | 'liter' | 'milliliter';