Skip to content

Commit 81b2cbf

Browse files
authored
Jwineman/react155 (#125)
* React.PropTypes -> prop-types * React 15.5
1 parent 5439cbc commit 81b2cbf

File tree

12 files changed

+621
-717
lines changed

12 files changed

+621
-717
lines changed

package.json

Lines changed: 13 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -40,22 +40,22 @@
4040
"babel-preset-es2015": "^6.1.18",
4141
"babel-preset-react": "^6.1.18",
4242
"c3": "^0.4.10",
43-
"cf-component-button": "^3.0.0",
43+
"cf-component-button": "3.0.0",
4444
"cf-component-card": "^1.1.0",
4545
"cf-component-checkbox": "^3.0.0",
4646
"cf-component-dropdown": "^2.0.0",
4747
"cf-component-flex": "^2.0.0",
4848
"cf-component-form": "^3.0.3",
4949
"cf-component-heading": "^2.0.0",
5050
"cf-component-input": "^3.0.0",
51-
"cf-component-layout": "^1.0.0",
51+
"cf-component-layout": "^1.2.1",
5252
"cf-component-link": "^4.0.0",
5353
"cf-component-list": "^2.0.0",
5454
"cf-component-loading": "^2.0.0",
55-
"cf-component-modal": "^4.2.0",
55+
"cf-component-modal": "5.3.0",
5656
"cf-component-notifications": "^2.0.0",
5757
"cf-component-radio": "^2.0.0",
58-
"cf-component-select": "^2.1.1",
58+
"cf-component-select": "^2.4.2",
5959
"cf-component-table": "^2.1.0",
6060
"cf-component-tabs": "^5.2.0",
6161
"cf-component-text": "^2.0.0",
@@ -66,24 +66,27 @@
6666
"eslint": "^3.4.0",
6767
"eslint-loader": "^1.6.1",
6868
"eslint-plugin-prettier": "^2.0.0",
69-
"history": "^3.2.1",
69+
"history": "3.2.1",
7070
"intl": "^1.1.0",
7171
"jest": "^19.0.2",
7272
"lodash": "^3.10.1",
7373
"markdown-it": "^8.3.1",
7474
"normalizr": "^2.0.0",
7575
"prettier": "^1.2.2",
76-
"react": "^15.4.2",
77-
"react-dom": "^15.4.2",
76+
"react": "^15.5.4",
77+
"react-dom": "^15.5.4",
7878
"react-gateway": "^2.0.4",
7979
"react-intl": "^2.0.0-beta-1",
80-
"react-redux": "^4.0.0",
81-
"react-router": "^3.0.2",
82-
"react-router-redux": "^4.0.7",
80+
"react-redux": "^5.0.4",
81+
"react-router": "3.0.5",
82+
"react-router-redux": "4.0.7",
8383
"react-test-renderer": "^15.4.2",
8484
"redux": "^3.0.4",
8585
"redux-logger": "^2.6.1",
8686
"redux-thunk": "^1.0.0",
8787
"webpack": "^2.2.1"
88+
},
89+
"dependencies": {
90+
"prop-types": "^15.5.8"
8891
}
8992
}

src/components/AnalyticCard/AnalyticCard.js

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
import React, { Component, PropTypes } from 'react';
1+
import React, { Component } from 'react';
2+
import PropTypes from 'prop-types';
23
import { connect } from 'react-redux';
34
import { injectIntl } from 'react-intl';
45
import { Card, CardSection, CardContent, CardDrawers } from 'cf-component-card';
@@ -128,9 +129,9 @@ class AnalyticCard extends Component {
128129
AnalyticCard.propTypes = {
129130
title: PropTypes.string.isRequired,
130131
description: PropTypes.string.isRequired,
131-
data: React.PropTypes.object.isRequired,
132-
dataType: React.PropTypes.string.isRequired,
133-
helpTextId: React.PropTypes.string.isRequired
132+
data: PropTypes.object.isRequired,
133+
dataType: PropTypes.string.isRequired,
134+
helpTextId: PropTypes.string.isRequired
134135
};
135136

136137
function mapStateToProps() {

src/components/AppNavigationLiNode/AppNavigationLiNode.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
import React, { Component, PropTypes } from 'react';
1+
import React, { Component } from 'react';
2+
import PropTypes from 'prop-types';
23
import { FormattedMessage } from 'react-intl';
34

45
import Link from 'cf-component-link';

src/components/C3Wrapper/C3Wrapper.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
import React, { Component } from 'react';
2+
import PropTypes from 'prop-types';
23
import c3 from 'c3';
34

45
export default class C3Wrapper extends Component {
@@ -28,5 +29,5 @@ export default class C3Wrapper extends Component {
2829
}
2930

3031
C3Wrapper.propTypes = {
31-
config: React.PropTypes.object.isRequired
32+
config: PropTypes.object.isRequired
3233
};

src/components/CustomCardControl/CustomCardControl.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
import React, { Component, PropTypes } from 'react';
1+
import React, { Component } from 'react';
2+
import PropTypes from 'prop-types';
23
import { connect } from 'react-redux';
34
import { FormattedMessage, injectIntl } from 'react-intl';
45
import { CardControl } from 'cf-component-card';

src/components/FeatureManager/FeatureManager.js

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
import React, { Component } from 'react';
2+
import PropTypes from 'prop-types';
23

34
export default class FeatureManager extends Component {
45
render() {
@@ -12,6 +13,6 @@ export default class FeatureManager extends Component {
1213
}
1314

1415
FeatureManager.propTypes = {
15-
isEnabled: React.PropTypes.bool.isRequired,
16-
error: React.PropTypes.string
16+
isEnabled: PropTypes.bool.isRequired,
17+
error: PropTypes.string
1718
};

src/components/FormattedMarkdown/FormattedMarkdown.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
import React, { Component, PropTypes } from 'react';
1+
import React, { Component } from 'react';
2+
import PropTypes from 'prop-types';
23
import { connect } from 'react-redux';
34
import { injectIntl } from 'react-intl';
45
import MarkdownIt from 'markdown-it';

src/components/MarketingFeature/MarketingFeature.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
import React, { Component, PropTypes } from 'react';
1+
import React, { Component } from 'react';
2+
import PropTypes from 'prop-types';
23

34
export default class MarketingFeature extends Component {
45
render() {

src/components/TimeSeriesChart/TimeSeriesChart.js

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
import React, { Component } from 'react';
2+
import PropTypes from 'prop-types';
23
import C3Wrapper from '../C3Wrapper/C3Wrapper';
34

45
export default class TimeSeriesChart extends Component {
@@ -59,6 +60,6 @@ export default class TimeSeriesChart extends Component {
5960
}
6061

6162
TimeSeriesChart.propTypes = {
62-
xAxisValues: React.PropTypes.array,
63-
yAxisLabel: React.PropTypes.string
63+
xAxisValues: PropTypes.array,
64+
yAxisLabel: PropTypes.string
6465
};

src/containers/AppNavigation/AppNavigation.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
import React, { Component, PropTypes } from 'react';
1+
import React, { Component } from 'react';
2+
import PropTypes from 'prop-types';
23
import { connect } from 'react-redux';
34
import { injectIntl } from 'react-intl';
45
import { push } from 'react-router-redux';

0 commit comments

Comments
 (0)