react-intl 3.12.0 → 3.12.1

package/lib/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/lib/components/provider.js

@@ -6,7 +6,6 @@
 import * as React from 'react';
 import { Provider } from './injectIntl';
 import { createError, DEFAULT_INTL_CONFIG, createFormatters, invariantIntlContext, createIntlCache, } from '../utils';
-import areIntlLocalesSupported from 'intl-locales-supported';
 import { formatNumber, formatNumberToParts } from '../formatters/number';
 import { formatRelativeTime } from '../formatters/relativeTime';
 import { formatDate, formatTime, formatDateToParts, formatTimeToParts, } from '../formatters/dateTime';
@@ -36,12 +35,10 @@ function processIntlConfig(config) {
 export function createIntl(config, cache) {
     const formatters = createFormatters(cache);
     const resolvedConfig = Object.assign(Object.assign({}, DEFAULT_INTL_CONFIG), config);
-    if (!resolvedConfig.locale ||
-        !areIntlLocalesSupported(resolvedConfig.locale)) {
-        const { locale, defaultLocale, onError } = resolvedConfig;
-        if (typeof onError === 'function') {
-            onError(createError(`Missing locale data for locale: "${locale}". ` +
-                `Using default locale: "${defaultLocale}" as fallback.`));
+    const { locale, defaultLocale, onError } = resolvedConfig;
+    if (!locale) {
+        if (onError) {
+            onError(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.
@@ -50,6 +47,13 @@ export function createIntl(config, cache) {
         // each <FormattedMessage> contains a `defaultMessage` prop.
         resolvedConfig.locale = resolvedConfig.defaultLocale || 'en';
     }
+    else if (!Intl.NumberFormat.supportedLocalesOf(locale).length && onError) {
+        onError(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(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 Object.assign(Object.assign({}, resolvedConfig), { formatters, formatNumber: formatNumber.bind(null, resolvedConfig, formatters.getNumberFormat), formatNumberToParts: formatNumberToParts.bind(null, resolvedConfig, formatters.getNumberFormat), formatRelativeTime: formatRelativeTime.bind(null, resolvedConfig, formatters.getRelativeTimeFormat), formatDate: formatDate.bind(null, resolvedConfig, formatters.getDateTimeFormat), formatDateToParts: formatDateToParts.bind(null, resolvedConfig, formatters.getDateTimeFormat), formatTime: formatTime.bind(null, resolvedConfig, formatters.getDateTimeFormat), formatTimeToParts: formatTimeToParts.bind(null, resolvedConfig, formatters.getDateTimeFormat), formatPlural: formatPlural.bind(null, resolvedConfig, formatters.getPluralRules), formatMessage: formatMessage.bind(null, resolvedConfig, formatters), formatHTMLMessage: formatHTMLMessage.bind(null, resolvedConfig, formatters), formatList: formatList.bind(null, resolvedConfig, formatters.getListFormat), formatDisplayName: formatDisplayName.bind(null, resolvedConfig, formatters.getDisplayNames) });
 }
 export default class IntlProvider extends React.PureComponent {

package/lib/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/lib/index.js

@@ -1,4 +1,6 @@
-export { defineMessages } from '@formatjs/macro';
+export function defineMessages(msgs) {
+    return msgs;
+}
 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

@@ -1,4 +1,3 @@
-import { defineMessages } from '@formatjs/macro';
 import { DisplayNames } from '@formatjs/intl-displaynames';
 import { DisplayNamesOptions } from '@formatjs/intl-displaynames';
 import { DisplayNamesOptions as DisplayNamesOptions_2 } from '@formatjs/intl-displaynames/lib';
@@ -33,7 +32,8 @@ export declare interface CustomFormats extends Partial<Formats> {
 }
 
 declare const DEFAULT_INTL_CONFIG: Pick<IntlConfig, 'formats' | 'messages' | 'timeZone' | 'textComponent' | 'defaultLocale' | 'defaultFormats' | 'onError'>;
-export { defineMessages }
+
+export declare function defineMessages<T, U extends Record<string, T>>(msgs: U): U;
 
 export declare type FormatDateOptions = Exclude<Intl.DateTimeFormatOptions, 'localeMatcher'> & CustomFormatConfig;
 
@@ -91,7 +91,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>;

package/lib/tsdoc-metadata.json

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-intl",
-  "version": "3.12.0",
+  "version": "3.12.1",
   "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",
@@ -132,50 +132,48 @@
   "sideEffects": false,
   "dependencies": {
     "@formatjs/intl-displaynames": "^1.2.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",
+    "@formatjs/intl-listformat": "^1.4.1",
+    "@formatjs/intl-relativetimeformat": "^4.5.9",
+    "@formatjs/intl-unified-numberformat": "^3.2.0",
+    "@formatjs/intl-utils": "^2.2.0",
     "@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.19",
-    "intl-locales-supported": "^1.8.4",
-    "intl-messageformat": "^7.8.2",
-    "intl-messageformat-parser": "^3.6.2",
+    "hoist-non-react-statics": "^3.3.2",
+    "intl-format-cache": "^4.2.21",
+    "intl-messageformat": "^7.8.4",
+    "intl-messageformat-parser": "^3.6.4",
     "shallow-equal": "^1.2.1"
   },
   "peerDependencies": {
     "react": "^16.3.0"
   },
   "devDependencies": {
-    "@babel/core": "^7.7.7",
-    "@babel/node": "^7.7.7",
-    "@babel/plugin-proposal-class-properties": "^7.7.4",
-    "@babel/plugin-transform-modules-commonjs": "^7.7.5",
-    "@babel/preset-env": "^7.7.7",
-    "@babel/preset-react": "^7.7.4",
-    "@formatjs/intl-pluralrules": "^1.5.0",
-    "@microsoft/api-documenter": "^7.7.3",
-    "@microsoft/api-extractor": "^7.7.1",
+    "@babel/core": "^7.8.4",
+    "@babel/node": "^7.8.4",
+    "@babel/plugin-proposal-class-properties": "^7.8.3",
+    "@babel/plugin-transform-modules-commonjs": "^7.8.3",
+    "@babel/preset-env": "^7.8.4",
+    "@babel/preset-react": "^7.8.3",
+    "@formatjs/intl-pluralrules": "^1.5.2",
+    "@microsoft/api-documenter": "^7.7.12",
+    "@microsoft/api-extractor": "^7.7.8",
     "@types/benchmark": "^1.0.31",
     "@types/enzyme": "^3.10.4",
-    "@types/jest": "^24.0.25",
+    "@types/jest": "^24.9.1",
     "@types/prop-types": "^15.7.3",
-    "@types/react": "^16.9.17",
-    "@types/react-dom": "^16.9.4",
-    "@typescript-eslint/eslint-plugin": "^2.15.0",
-    "@typescript-eslint/parser": "^2.15.0",
+    "@types/react": "^16.9.19",
+    "@types/react-dom": "^16.9.5",
+    "@typescript-eslint/eslint-plugin": "^2.19.0",
+    "@typescript-eslint/parser": "^2.19.0",
     "babel-jest": "^24.9.0",
     "benchmark": "^2.1.0",
-    "core-js": "^3.6.2",
+    "core-js": "^3.6.4",
     "cross-env": "^6.0.3",
     "enzyme": "^3.11.0",
     "enzyme-adapter-react-16": "^1.15.2",
-    "enzyme-to-json": "^3.4.3",
+    "enzyme-to-json": "^3.4.4",
     "eslint": "^6.8.0",
-    "eslint-plugin-react": "^7.17.0",
+    "eslint-plugin-react": "^7.18.3",
     "fs-extra": "^8.1.0",
     "full-icu": "^1.3.0",
     "glob": "^7.1.6",
@@ -187,19 +185,19 @@
     "prettier": "^1.19.1",
     "react": "^16.12.0",
     "react-dom": "^16.12.0",
-    "rimraf": "^3.0.0",
-    "rollup": "^1.29.0",
+    "rimraf": "^3.0.1",
+    "rollup": "^1.31.0",
     "rollup-plugin-babel": "^4.3.3",
     "rollup-plugin-commonjs": "^10.1.0",
     "rollup-plugin-node-resolve": "^5.2.0",
     "rollup-plugin-replace": "^2.0.0",
     "rollup-plugin-typescript2": "^0.25.3",
     "rollup-plugin-uglify": "^6.0.4",
-    "standard-version": "^7.0.1",
+    "standard-version": "^7.1.0",
     "ts-jest": "^24.3.0",
-    "ts-node": "^8.5.4",
+    "ts-node": "^8.6.2",
     "tslib": "^1.9.3",
-    "typescript": "^3.7.0"
+    "typescript": "^3.7.5"
   },
   "scripts": {
     "benchmark": "cross-env NODE_ENV=production TS_NODE_PROJECT=./tsconfig.cjs.json ts-node test/perf/index.tsx",

package/src/components/provider.tsx

@@ -14,7 +14,6 @@ import {
   createIntlCache,
 } from '../utils';
 import {IntlConfig, IntlShape, Omit, IntlCache} from '../types';
-import areIntlLocalesSupported from 'intl-locales-supported';
 import {formatNumber, formatNumberToParts} from '../formatters/number';
 import {formatRelativeTime} from '../formatters/relativeTime';
 import {
@@ -80,26 +79,36 @@ export function createIntl(
 ): IntlShape {
   const formatters = createFormatters(cache);
   const resolvedConfig = {...DEFAULT_INTL_CONFIG, ...config};
-  if (
-    !resolvedConfig.locale ||
-    !areIntlLocalesSupported(resolvedConfig.locale)
-  ) {
-    const {locale, defaultLocale, onError} = resolvedConfig;
-    if (typeof onError === 'function') {
+  const {locale, defaultLocale, onError} = resolvedConfig;
+  if (!locale) {
+    if (onError) {
       onError(
         createError(
-          `Missing locale data for locale: "${locale}". ` +
-            `Using default locale: "${defaultLocale}" as fallback.`
+          `"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.
     // The `messages` are overridden to the `defaultProps` empty object
     // to maintain referential equality across re-renders. It's assumed
     // each <FormattedMessage> contains a `defaultMessage` prop.
     resolvedConfig.locale = resolvedConfig.defaultLocale || 'en';
+  } else if (!Intl.NumberFormat.supportedLocalesOf(locale).length && onError) {
+    onError(
+      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(
+      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 {
     ...resolvedConfig,

package/src/index.ts

@@ -5,7 +5,9 @@
  */
 import * as React from 'react';
 export * from './types';
-export {defineMessages} from '@formatjs/macro';
+export function defineMessages<T, U extends Record<string, T>>(msgs: U): U {
+  return msgs;
+}
 import {
   createFormattedComponent,
   createFormattedDateTimePartsComponent,