react-intl 2.2.3 → 2.3.0

package/lib/index.es.js

@@ -7,7 +7,8 @@
 import allLocaleData from '../locale-data/index.js';
 import IntlMessageFormat from 'intl-messageformat';
 import IntlRelativeFormat from 'intl-relativeformat';
-import React, { Children, Component, PropTypes, createElement, isValidElement } from 'react';
+import PropTypes from 'prop-types';
+import React, { Children, Component, createElement, isValidElement } from 'react';
 import invariant from 'invariant';
 import memoizeIntlConstructor from 'intl-format-cache';
 
@@ -1137,20 +1138,24 @@ var FormattedRelative = function (_Component) {
         value: function scheduleNextUpdate(props, state) {
             var _this2 = this;
 
-            var updateInterval = props.updateInterval;
+            // Cancel and pending update because we're scheduling a new update.
+            clearTimeout(this._timer);
+
+            var value = props.value,
+                units = props.units,
+                updateInterval = props.updateInterval;
 
-            // If the `updateInterval` is falsy, including `0`, then auto updates
-            // have been turned off, so we bail and skip scheduling an update.
+            var time = new Date(value).getTime();
 
-            if (!updateInterval) {
+            // If the `updateInterval` is falsy, including `0` or we don't have a
+            // valid date, then auto updates have been turned off, so we bail and
+            // skip scheduling an update.
+            if (!updateInterval || !isFinite(time)) {
                 return;
             }
 
-            var time = new Date(props.value).getTime();
             var delta = time - state.now;
-            var units = props.units || selectUnits(delta);
-
-            var unitDelay = getUnitDelay(units);
+            var unitDelay = getUnitDelay(units || selectUnits(delta));
             var unitRemainder = Math.abs(delta % unitDelay);
 
             // We want the largest possible timer delay which will still display
@@ -1159,8 +1164,6 @@ var FormattedRelative = function (_Component) {
             // "1 minute ago" to "2 minutes ago" when the delta is 120,000ms.
             var delay = delta < 0 ? Math.max(updateInterval, unitDelay - unitRemainder) : Math.max(updateInterval, unitRemainder);
 
-            clearTimeout(this._timer);
-
             this._timer = setTimeout(function () {
                 _this2.setState({ now: _this2.context.intl.now() });
             }, delay);
@@ -1446,42 +1449,40 @@ var FormattedMessage = function (_Component) {
 
             var hasValues = values && Object.keys(values).length > 0;
             if (hasValues) {
-                (function () {
-                    // Creates a token with a random UID that should not be guessable or
-                    // conflict with other parts of the `message` string.
-                    var uid = Math.floor(Math.random() * 0x10000000000).toString(16);
-
-                    var generateToken = function () {
-                        var counter = 0;
-                        return function () {
-                            return 'ELEMENT-' + uid + '-' + (counter += 1);
-                        };
-                    }();
-
-                    // Splitting with a delimiter to support IE8. When using a regex
-                    // with a capture group IE8 does not include the capture group in
-                    // the resulting array.
-                    tokenDelimiter = '@__' + uid + '__@';
-                    tokenizedValues = {};
-                    elements = {};
-
-                    // Iterates over the `props` to keep track of any React Element
-                    // values so they can be represented by the `token` as a placeholder
-                    // when the `message` is formatted. This allows the formatted
-                    // message to then be broken-up into parts with references to the
-                    // React Elements inserted back in.
-                    Object.keys(values).forEach(function (name) {
-                        var value = values[name];
-
-                        if (isValidElement(value)) {
-                            var token = generateToken();
-                            tokenizedValues[name] = tokenDelimiter + token + tokenDelimiter;
-                            elements[token] = value;
-                        } else {
-                            tokenizedValues[name] = value;
-                        }
-                    });
-                })();
+                // Creates a token with a random UID that should not be guessable or
+                // conflict with other parts of the `message` string.
+                var uid = Math.floor(Math.random() * 0x10000000000).toString(16);
+
+                var generateToken = function () {
+                    var counter = 0;
+                    return function () {
+                        return 'ELEMENT-' + uid + '-' + (counter += 1);
+                    };
+                }();
+
+                // Splitting with a delimiter to support IE8. When using a regex
+                // with a capture group IE8 does not include the capture group in
+                // the resulting array.
+                tokenDelimiter = '@__' + uid + '__@';
+                tokenizedValues = {};
+                elements = {};
+
+                // Iterates over the `props` to keep track of any React Element
+                // values so they can be represented by the `token` as a placeholder
+                // when the `message` is formatted. This allows the formatted
+                // message to then be broken-up into parts with references to the
+                // React Elements inserted back in.
+                Object.keys(values).forEach(function (name) {
+                    var value = values[name];
+
+                    if (isValidElement(value)) {
+                        var token = generateToken();
+                        tokenizedValues[name] = tokenDelimiter + token + tokenDelimiter;
+                        elements[token] = value;
+                    } else {
+                        tokenizedValues[name] = value;
+                    }
+                });
             }
 
             var descriptor = { id: id, description: description, defaultMessage: defaultMessage };

package/lib/index.js

@@ -13,6 +13,7 @@ function _interopDefault (ex) { return (ex && (typeof ex === 'object') && 'defau
 var allLocaleData = _interopDefault(require('../locale-data/index.js'));
 var IntlMessageFormat = _interopDefault(require('intl-messageformat'));
 var IntlRelativeFormat = _interopDefault(require('intl-relativeformat'));
+var PropTypes = _interopDefault(require('prop-types'));
 var React = require('react');
 var React__default = _interopDefault(React);
 var invariant = _interopDefault(require('invariant'));
@@ -219,14 +220,14 @@ var toConsumableArray = function (arr) {
  * See the accompanying LICENSE file for terms.
  */
 
-var bool = React.PropTypes.bool;
-var number = React.PropTypes.number;
-var string = React.PropTypes.string;
-var func = React.PropTypes.func;
-var object = React.PropTypes.object;
-var oneOf = React.PropTypes.oneOf;
-var shape = React.PropTypes.shape;
-var any = React.PropTypes.any;
+var bool = PropTypes.bool;
+var number = PropTypes.number;
+var string = PropTypes.string;
+var func = PropTypes.func;
+var object = PropTypes.object;
+var oneOf = PropTypes.oneOf;
+var shape = PropTypes.shape;
+var any = PropTypes.any;
 
 var localeMatcher = oneOf(['best fit', 'lookup']);
 var narrowShortLong = oneOf(['narrow', 'short', 'long']);
@@ -928,8 +929,8 @@ IntlProvider.childContextTypes = {
     intl: intlShape.isRequired
 };
 process.env.NODE_ENV !== "production" ? IntlProvider.propTypes = _extends({}, intlConfigPropTypes, {
-    children: React.PropTypes.element.isRequired,
-    initialNow: React.PropTypes.any
+    children: PropTypes.element.isRequired,
+    initialNow: PropTypes.any
 }) : void 0;
 
 /*
@@ -991,9 +992,9 @@ FormattedDate.contextTypes = {
     intl: intlShape
 };
 process.env.NODE_ENV !== "production" ? FormattedDate.propTypes = _extends({}, dateTimeFormatPropTypes, {
-    value: React.PropTypes.any.isRequired,
-    format: React.PropTypes.string,
-    children: React.PropTypes.func
+    value: PropTypes.any.isRequired,
+    format: PropTypes.string,
+    children: PropTypes.func
 }) : void 0;
 
 /*
@@ -1055,9 +1056,9 @@ FormattedTime.contextTypes = {
     intl: intlShape
 };
 process.env.NODE_ENV !== "production" ? FormattedTime.propTypes = _extends({}, dateTimeFormatPropTypes, {
-    value: React.PropTypes.any.isRequired,
-    format: React.PropTypes.string,
-    children: React.PropTypes.func
+    value: PropTypes.any.isRequired,
+    format: PropTypes.string,
+    children: PropTypes.func
 }) : void 0;
 
 /*
@@ -1144,20 +1145,24 @@ var FormattedRelative = function (_Component) {
         value: function scheduleNextUpdate(props, state) {
             var _this2 = this;
 
-            var updateInterval = props.updateInterval;
+            // Cancel and pending update because we're scheduling a new update.
+            clearTimeout(this._timer);
+
+            var value = props.value,
+                units = props.units,
+                updateInterval = props.updateInterval;
 
-            // If the `updateInterval` is falsy, including `0`, then auto updates
-            // have been turned off, so we bail and skip scheduling an update.
+            var time = new Date(value).getTime();
 
-            if (!updateInterval) {
+            // If the `updateInterval` is falsy, including `0` or we don't have a
+            // valid date, then auto updates have been turned off, so we bail and
+            // skip scheduling an update.
+            if (!updateInterval || !isFinite(time)) {
                 return;
             }
 
-            var time = new Date(props.value).getTime();
             var delta = time - state.now;
-            var units = props.units || selectUnits(delta);
-
-            var unitDelay = getUnitDelay(units);
+            var unitDelay = getUnitDelay(units || selectUnits(delta));
             var unitRemainder = Math.abs(delta % unitDelay);
 
             // We want the largest possible timer delay which will still display
@@ -1166,8 +1171,6 @@ var FormattedRelative = function (_Component) {
             // "1 minute ago" to "2 minutes ago" when the delta is 120,000ms.
             var delay = delta < 0 ? Math.max(updateInterval, unitDelay - unitRemainder) : Math.max(updateInterval, unitRemainder);
 
-            clearTimeout(this._timer);
-
             this._timer = setTimeout(function () {
                 _this2.setState({ now: _this2.context.intl.now() });
             }, delay);
@@ -1242,11 +1245,11 @@ FormattedRelative.defaultProps = {
     updateInterval: 1000 * 10
 };
 process.env.NODE_ENV !== "production" ? FormattedRelative.propTypes = _extends({}, relativeFormatPropTypes, {
-    value: React.PropTypes.any.isRequired,
-    format: React.PropTypes.string,
-    updateInterval: React.PropTypes.number,
-    initialNow: React.PropTypes.any,
-    children: React.PropTypes.func
+    value: PropTypes.any.isRequired,
+    format: PropTypes.string,
+    updateInterval: PropTypes.number,
+    initialNow: PropTypes.any,
+    children: PropTypes.func
 }) : void 0;
 
 /*
@@ -1308,9 +1311,9 @@ FormattedNumber.contextTypes = {
     intl: intlShape
 };
 process.env.NODE_ENV !== "production" ? FormattedNumber.propTypes = _extends({}, numberFormatPropTypes, {
-    value: React.PropTypes.any.isRequired,
-    format: React.PropTypes.string,
-    children: React.PropTypes.func
+    value: PropTypes.any.isRequired,
+    format: PropTypes.string,
+    children: PropTypes.func
 }) : void 0;
 
 /*
@@ -1377,16 +1380,16 @@ FormattedPlural.defaultProps = {
     style: 'cardinal'
 };
 process.env.NODE_ENV !== "production" ? FormattedPlural.propTypes = _extends({}, pluralFormatPropTypes, {
-    value: React.PropTypes.any.isRequired,
+    value: PropTypes.any.isRequired,
 
-    other: React.PropTypes.node.isRequired,
-    zero: React.PropTypes.node,
-    one: React.PropTypes.node,
-    two: React.PropTypes.node,
-    few: React.PropTypes.node,
-    many: React.PropTypes.node,
+    other: PropTypes.node.isRequired,
+    zero: PropTypes.node,
+    one: PropTypes.node,
+    two: PropTypes.node,
+    few: PropTypes.node,
+    many: PropTypes.node,
 
-    children: React.PropTypes.func
+    children: PropTypes.func
 }) : void 0;
 
 /*
@@ -1453,42 +1456,40 @@ var FormattedMessage = function (_Component) {
 
             var hasValues = values && Object.keys(values).length > 0;
             if (hasValues) {
-                (function () {
-                    // Creates a token with a random UID that should not be guessable or
-                    // conflict with other parts of the `message` string.
-                    var uid = Math.floor(Math.random() * 0x10000000000).toString(16);
-
-                    var generateToken = function () {
-                        var counter = 0;
-                        return function () {
-                            return 'ELEMENT-' + uid + '-' + (counter += 1);
-                        };
-                    }();
-
-                    // Splitting with a delimiter to support IE8. When using a regex
-                    // with a capture group IE8 does not include the capture group in
-                    // the resulting array.
-                    tokenDelimiter = '@__' + uid + '__@';
-                    tokenizedValues = {};
-                    elements = {};
-
-                    // Iterates over the `props` to keep track of any React Element
-                    // values so they can be represented by the `token` as a placeholder
-                    // when the `message` is formatted. This allows the formatted
-                    // message to then be broken-up into parts with references to the
-                    // React Elements inserted back in.
-                    Object.keys(values).forEach(function (name) {
-                        var value = values[name];
-
-                        if (React.isValidElement(value)) {
-                            var token = generateToken();
-                            tokenizedValues[name] = tokenDelimiter + token + tokenDelimiter;
-                            elements[token] = value;
-                        } else {
-                            tokenizedValues[name] = value;
-                        }
-                    });
-                })();
+                // Creates a token with a random UID that should not be guessable or
+                // conflict with other parts of the `message` string.
+                var uid = Math.floor(Math.random() * 0x10000000000).toString(16);
+
+                var generateToken = function () {
+                    var counter = 0;
+                    return function () {
+                        return 'ELEMENT-' + uid + '-' + (counter += 1);
+                    };
+                }();
+
+                // Splitting with a delimiter to support IE8. When using a regex
+                // with a capture group IE8 does not include the capture group in
+                // the resulting array.
+                tokenDelimiter = '@__' + uid + '__@';
+                tokenizedValues = {};
+                elements = {};
+
+                // Iterates over the `props` to keep track of any React Element
+                // values so they can be represented by the `token` as a placeholder
+                // when the `message` is formatted. This allows the formatted
+                // message to then be broken-up into parts with references to the
+                // React Elements inserted back in.
+                Object.keys(values).forEach(function (name) {
+                    var value = values[name];
+
+                    if (React.isValidElement(value)) {
+                        var token = generateToken();
+                        tokenizedValues[name] = tokenDelimiter + token + tokenDelimiter;
+                        elements[token] = value;
+                    } else {
+                        tokenizedValues[name] = value;
+                    }
+                });
             }
 
             var descriptor = { id: id, description: description, defaultMessage: defaultMessage };
@@ -1531,9 +1532,9 @@ FormattedMessage.defaultProps = {
     values: {}
 };
 process.env.NODE_ENV !== "production" ? FormattedMessage.propTypes = _extends({}, messageDescriptorPropTypes, {
-    values: React.PropTypes.object,
-    tagName: React.PropTypes.string,
-    children: React.PropTypes.func
+    values: PropTypes.object,
+    tagName: PropTypes.string,
+    children: PropTypes.func
 }) : void 0;
 
 /*
@@ -1624,9 +1625,9 @@ FormattedHTMLMessage.defaultProps = {
     values: {}
 };
 process.env.NODE_ENV !== "production" ? FormattedHTMLMessage.propTypes = _extends({}, messageDescriptorPropTypes, {
-    values: React.PropTypes.object,
-    tagName: React.PropTypes.string,
-    children: React.PropTypes.func
+    values: PropTypes.object,
+    tagName: PropTypes.string,
+    children: PropTypes.func
 }) : void 0;
 
 /*

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-intl",
-  "version": "2.2.3",
+  "version": "2.3.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",
@@ -70,25 +70,27 @@
     "invariant": "^2.1.1"
   },
   "peerDependencies": {
-    "react": "^0.14.0 || ^15.0.0-0"
+    "react": "^0.14.9 || ^15.0.0",
+    "prop-types": "^15.5.4"
   },
   "devDependencies": {
     "babel-cli": "^6.2.0",
     "babel-eslint": "^7.1.1",
-    "babel-jest": "^18.0.0",
+    "babel-jest": "^19.0.0",
     "babel-plugin-external-helpers": "^6.18.0",
     "babel-plugin-react-intl": "^2.0.0",
+    "babel-plugin-transform-async-to-generator": "^6.16.0",
     "babel-plugin-transform-class-properties": "^6.11.5",
     "babel-plugin-transform-es2015-modules-commonjs": "^6.18.0",
     "babel-plugin-transform-es3-member-expression-literals": "^6.3.13",
     "babel-plugin-transform-es3-property-literals": "^6.3.13",
     "babel-plugin-transform-object-rest-spread": "^6.1.18",
-    "babel-plugin-transform-react-remove-prop-types": "^0.2.10",
+    "babel-plugin-transform-react-remove-prop-types": "^0.3.2",
     "babel-preset-es2015": "^6.1.18",
     "babel-preset-react": "^6.1.18",
     "babelify": "^7.2.0",
     "benchmark": "^2.1.0",
-    "browserify": "^13.0.0",
+    "browserify": "^14.0.0",
     "browserify-shim": "^3.8.11",
     "cross-env": "^3.1.3",
     "eslint": "^3.10.2",
@@ -100,11 +102,12 @@
     "glob": "^7.0.0",
     "intl": "^1.2.1",
     "intl-messageformat-parser": "^1.2.0",
-    "jest": "^18.0.0",
+    "jest": "^19.0.0",
     "mkdirp": "^0.5.1",
-    "react": "^15.0.0",
-    "react-addons-test-utils": "^15.0.0",
-    "react-dom": "^15.0.0",
+    "prop-types": "^15.5.4",
+    "react": "^15.5.4",
+    "react-dom": "^15.5.4",
+    "react-test-renderer": "^15.5.4",
     "rimraf": "^2.4.2",
     "rollup": "^0.41.4",
     "rollup-plugin-babel": "^2.3.9",
@@ -118,7 +121,7 @@
     "watchify": "^3.7.0"
   },
   "scripts": {
-    "clean": "rimraf src/en.js coverage/ dist/ lib/ locale-data/",
+    "clean": "rimraf src/en.js coverage/ dist/ lib/ locale-data/ test/renderer.js",
     "build:data": "babel-node scripts/build-data",
     "build:lib": "rollup -c rollup.config.lib.js",
     "build:dist:dev": "cross-env NODE_ENV=development rollup -c rollup.config.dist.js",
@@ -127,7 +130,7 @@
     "build": "npm run build:data && npm run build:lib && npm run build:dist",
     "react:clean": "rimraf node_modules/{react,react-dom,react-addons-test-utils}",
     "react:14": "npm run react:clean && npm i react@^0.14 react-dom@^0.14 react-addons-test-utils@^0.14",
-    "react:15": "npm run react:clean && npm i react@^15 react-dom@^15 react-addons-test-utils@^15",
+    "react:15": "npm run react:clean && npm i react@^15 react-dom@^15",
     "lint": "eslint .",
     "lint:fix": "eslint . --fix",
     "test": "jest --coverage --verbose",