Skip to content

Commit b62da76

Browse files
authored
Merge pull request #289 from jphamilton/master
Updated to React 15.5.4
2 parents 918f6a8 + 259d693 commit b62da76

File tree

4 files changed

+15
-11
lines changed

4 files changed

+15
-11
lines changed

package.json

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@
4141
"babel-preset-es2015": "^6.18.0",
4242
"babel-preset-react": "^6.16.0",
4343
"babel-preset-stage-2": "^6.18.0",
44+
"create-react-class": "^15.5.2",
4445
"exports-loader": "^0.6.2",
4546
"file-loader": "^0.10.1",
4647
"highlight.js": "^9.10.0",
@@ -49,10 +50,10 @@
4950
"mocha": "^3.2.0",
5051
"mock-require": "^2.0.1",
5152
"nightwatch": "^0.9.6",
53+
"prop-types": "^15.5.8",
5254
"raw-loader": "^0.5.1",
53-
"react": "^15.4.2",
54-
"react-addons-test-utils": "^15.4.2",
55-
"react-dom": "^15.4.2",
55+
"react": "^15.5.4",
56+
"react-dom": "^15.5.4",
5657
"react-highlight": "^0.9.0",
5758
"sinon": "^2.0.0",
5859
"webpack": "^2.2.1",

src/RedrawOnPrint.jsx

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
var React = require('react');
2+
var createReactClass = require('create-react-class');
23

3-
var RedrawOnPrint = React.createClass({
4+
var RedrawOnPrint = createReactClass({
45
componentDidMount() {
56
// This is a listiner bind to the print media query
67
// it call reflow since highcharts doesn't reflow upon print

src/chartsFactory.jsx

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,19 @@
11
var React = require('react');
2+
var createReactClass = require('create-react-class');
3+
var PropTypes = require('prop-types');
24
var win = typeof global === 'undefined' ? window : global;
35

46
module.exports = function (chartType, Highcharts){
57
var displayName = 'Highcharts' + chartType;
6-
var result = React.createClass({
8+
var result = createReactClass({
79
displayName: displayName,
810

911
propTypes: {
10-
config: React.PropTypes.object.isRequired,
11-
isPureConfig: React.PropTypes.bool,
12-
neverReflow: React.PropTypes.bool,
13-
callback: React.PropTypes.func,
14-
domProps: React.PropTypes.object
12+
config: PropTypes.object,
13+
isPureConfig: PropTypes.bool,
14+
neverReflow: PropTypes.bool,
15+
callback: PropTypes.func,
16+
domProps: PropTypes.object
1517
},
1618

1719
defaultProps: {

test/unit/nonbundleSpec.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
var React = require('react');
22
var assert = require('assert');
3-
var TestUtils = require('react-addons-test-utils');
3+
var TestUtils = require('react-dom/test-utils');
44
var mock = require('mock-require');
55
var sinon = require('sinon');
66

0 commit comments

Comments
 (0)