Replace Object.assign with object spread property syntax

Author: ericf

examples/translations/src/client/components/locales-menu.js

@@ -1,4 +1,4 @@
-import React, {Component, PropTypes} from 'react';
+import React, {Component} from 'react';
 import {intlShape, defineMessage} from 'react-intl';
 
 const enUSDescription = defineMessage({

scripts/build-locale-data.js

@@ -28,7 +28,7 @@ export default ${serialize(localeData)};
     );
 }
 
-function createDataDistFile(localeData) {
+function createDistDataScript(localeData) {
     return (
 `// GENERATED FILE
 ReactIntl.addLocaleData(${serialize(localeData)});
@@ -51,5 +51,5 @@ fs.writeFileSync('src/locale-data/index.js',
 
 dataByLang.forEach((data, lang) => {
     fs.writeFileSync(`src/locale-data/${lang}.js`, createDataModule(data));
-    fs.writeFileSync(`dist/locale-data/${lang}.js`, createDataDistFile(data));
+    fs.writeFileSync(`dist/locale-data/${lang}.js`, createDistDataScript(data));
 });

src/components/date.js

@@ -21,10 +21,11 @@ export default class FormattedDate extends Component {
     }
 }
 
-FormattedDate.propTypes = Object.assign({}, dateTimeFormatPropTypes, {
+FormattedDate.propTypes = {
+    ...dateTimeFormatPropTypes,
     format: PropTypes.string,
     value : PropTypes.any.isRequired,
-});
+};
 
 FormattedDate.contextTypes = {
     intl: intlShape.isRequired,

src/components/html-message.js

@@ -11,10 +11,12 @@ export default class FormattedHTMLMessage extends Component {
             return true;
         }
 
-        return shouldIntlComponentUpdate(this,
-            Object.assign({}, nextProps, {values: null}),
-            ...next
-        );
+        let nextPropsToCheck = {
+            ...nextProps,
+            values: null,
+        };
+
+        return shouldIntlComponentUpdate(this, nextPropsToCheck, ...next);
     }
 
     render() {

src/components/intl.js

@@ -47,7 +47,12 @@ export default class IntlProvider extends Component {
         // Bind intl factories and current config to the format functions.
         let boundFormatFns = this.getBoundFormatFns(intl, config);
 
-        return {intl: Object.assign({}, config, boundFormatFns)};
+        return {
+            intl: {
+                ...config,
+                ...boundFormatFns,
+            },
+        };
     }
 
     shouldComponentUpdate(...next) {
@@ -59,9 +64,9 @@ export default class IntlProvider extends Component {
 
         if (typeof children === 'function') {
             // TODO: Pass the result of `this.getChildContext()` to the child fn?
-            // Or just `Object.assign({}, this.props, this.state)`? Or nothing!?
-            // Passing stuff would expose the underlying info and make it part
-            // of the public API.
+            // Or just `{...this.props, ...this.state}`? Or nothing!? Passing
+            // stuff would expose the underlying info and make it part of the
+            // public API.
             return children();
         }
 

src/components/message.js

@@ -11,10 +11,12 @@ export default class FormattedMessage extends Component {
             return true;
         }
 
-        return shouldIntlComponentUpdate(this,
-            Object.assign({}, nextProps, {values: null}),
-            ...next
-        );
+        let nextPropsToCheck = {
+            ...nextProps,
+            values: null,
+        };
+
+        return shouldIntlComponentUpdate(this, nextPropsToCheck, ...next);
     }
 
     render() {

src/components/number.js

@@ -21,10 +21,11 @@ export default class FormattedNumber extends Component {
     }
 }
 
-FormattedNumber.propTypes = Object.assign({}, numberFormatPropTypes, {
+FormattedNumber.propTypes = {
+    ...numberFormatPropTypes,
     format: PropTypes.string,
     value : PropTypes.any.isRequired,
-});
+};
 
 FormattedNumber.contextTypes = {
     intl: intlShape.isRequired,

src/components/plural.js

@@ -22,15 +22,16 @@ export default class FormattedPlural extends Component {
     }
 }
 
-FormattedPlural.propTypes = Object.assign({}, pluralFormatPropTypes, {
+FormattedPlural.propTypes = {
+    ...pluralFormatPropTypes,
     value: PropTypes.any.isRequired,
     other: PropTypes.node.isRequired,
     zero : PropTypes.node,
     one  : PropTypes.node,
     two  : PropTypes.node,
     few  : PropTypes.node,
     many : PropTypes.node,
-});
+};
 
 FormattedPlural.defaultProps = {
     style: 'cardinal',

src/components/relative.js

@@ -21,11 +21,12 @@ export default class FormattedRelative extends Component {
     }
 }
 
-FormattedRelative.propTypes = Object.assign({}, relativeFormatPropTypes, {
+FormattedRelative.propTypes = {
+    ...relativeFormatPropTypes,
     format: PropTypes.string,
     value : PropTypes.any.isRequired,
     now   : PropTypes.any,
-});
+};
 
 FormattedRelative.contextTypes = {
     intl: intlShape.isRequired,

src/components/time.js

@@ -21,10 +21,11 @@ export default class FormattedTime extends Component {
     }
 }
 
-FormattedTime.propTypes = Object.assign({}, dateTimeFormatPropTypes, {
+FormattedTime.propTypes = {
+    ...dateTimeFormatPropTypes,
     format: PropTypes.string,
     value : PropTypes.any.isRequired,
-});
+};
 
 FormattedTime.contextTypes = {
     intl: intlShape.isRequired,