Upgrade React to v16 (1/2)

Ref #76
Ref #80

Signed-off-by: Frédéric Miserey <frederic@none.net>

Author: Frédéric Miserey

package.json

@@ -37,7 +37,7 @@
   "bugs": "https://github.com/jquery-support/react-globalize/issues",
   "peerDependencies": {
     "globalize": ">= 1.0.0",
-    "react": "^0.13 || ^0.14 || ^15.0.0"
+    "react": "^16.0.0-rc.2"
   },
   "devDependencies": {
     "babel-cli": "^6.26.0",
@@ -51,15 +51,16 @@
     "cldr-data": ">=25",
     "cldrjs": "^0.4.3",
     "create-react-class": "^15.5.2",
-    "enzyme": "2.2.0",
+    "enzyme": "^3.0.0",
+    "enzyme-adapter-react-16": "^1.0.0",
     "eslint": "^1.10.3",
     "eslint-config-defaults": "^7.1.1",
     "eslint-plugin-react": "^3.11.2",
     "globalize": "1.1.x",
     "mocha": "^4.0.0",
-    "react": "15.0.1",
-    "react-addons-test-utils": "15.0.1",
-    "react-dom": "15.0.1",
+    "react": "^16.0.0",
+    "react-dom": "^16.0.0",
+    "react-test-renderer": "^16.0.0",
     "rollup": "^0.50.0",
     "rollup-plugin-babel": "^3.0.2",
     "rollup-plugin-node-resolve": "^3.0.0",

src/generator.js

@@ -1,4 +1,3 @@
-import reactCreateClass from "./react-create-class";
 import React from "react";
 import Globalize from "globalize";
 
@@ -23,15 +22,18 @@ function generator(fn, localPropNames, options) {
     };
     var globalizePropNames = commonPropNames.concat(localPropNames);
 
-    return reactCreateClass({
-        displayName: Fn,
-        componentWillMount: function() {
+    return class extends React.Component {
+        static displayName = Fn;
+
+        componentWillMount() {
             this.setup(this.props);
-        },
-        componentWillReceiveProps: function(nextProps) {
+        }
+
+        componentWillReceiveProps(nextProps) {
             this.setup(nextProps);
-        },
-        setup: function(props) {
+        }
+
+        setup(props) {
             this.globalize = props.locale ? Globalize(props.locale) : Globalize;
             this.domProps = Object.keys(props).filter(omit(globalizePropNames)).reduce(function(memo, propKey) {
                 memo[propKey] = props[propKey];
@@ -46,11 +48,12 @@ function generator(fn, localPropNames, options) {
             beforeFormat.call(this, props);
             var formattedValue = this.globalize[fn].apply(this.globalize, this.globalizePropValues);
             this.value = afterFormat.call(this, formattedValue);
-        },
-        render: function() {
-            return React.DOM.span(this.domProps, this.value);
         }
-    });
+
+        render() {
+            return React.createElement("span", this.domProps, ...this.value);
+        }
+    };
 }
 
 export default generator;

src/message.js

@@ -141,7 +141,7 @@ function replaceElements(props, formatted) {
 
     // Elements replacement.
     if (elements) {
-        formatted = React.DOM.span.apply(React.DOM.span, [{}].concat(_replaceElements(formatted, elements)));
+        formatted = _replaceElements(formatted, elements);
     }
 
     return formatted;

src/react-create-class.js

@@ -1,8 +1,11 @@
 import { expect } from "chai";
 import React from "react";
-import { shallow } from "enzyme";
+import Enzyme, { shallow } from "enzyme";
+import Adapter from "enzyme-adapter-react-16";
 import Globalize from "globalize";
 
+Enzyme.configure({ adapter: new Adapter() });
+
 global.expect = expect;
 global.React = React;
 global.shallow = shallow;