Skip to content
This repository was archived by the owner on Jun 3, 2019. It is now read-only.

Commit 09c2d0f

Browse files
birkirctrlplusb
authored andcommitted
Prepare React 15.5 (#413)
* Update dependecies, change component prop-types. * Helmet now has prop-types support. * Update yarn lockfile * Bumped react-router and forgot prop types in clientconfig. * Bump enzyme and prop-types * Bump react-async-component and enzyme
1 parent ab73cb3 commit 09c2d0f

File tree

6 files changed

+196
-129
lines changed

6 files changed

+196
-129
lines changed

config/components/ClientConfig.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
import React from 'react';
2+
import PropTypes from 'prop-types';
23
import serialize from 'serialize-javascript';
34
import filterWithRules from '../../shared/utils/objects/filterWithRules';
45
import values from '../values';
@@ -35,7 +36,7 @@ function ClientConfig({ nonce }) {
3536
}
3637

3738
ClientConfig.propTypes = {
38-
nonce: React.PropTypes.string.isRequired,
39+
nonce: PropTypes.string.isRequired,
3940
};
4041

4142
export default ClientConfig;

package.json

Lines changed: 16 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -68,19 +68,20 @@
6868
"modernizr": "3.4.0",
6969
"normalize.css": "6.0.0",
7070
"offline-plugin": "4.6.2",
71-
"react": "15.4.2",
71+
"prop-types": "15.5.8",
72+
"react": "15.5.4",
7273
"react-async-bootstrapper": "1.1.1",
73-
"react-async-component": "1.0.0-beta.2",
74-
"react-dom": "15.4.2",
75-
"react-helmet": "5.0.2",
76-
"react-router-dom": "4.0.0",
74+
"react-async-component": "1.0.0-beta.3",
75+
"react-dom": "15.5.4",
76+
"react-helmet": "5.0.3",
77+
"react-router-dom": "4.1.1",
7778
"serialize-javascript": "1.3.0",
7879
"uuid": "3.0.1"
7980
},
8081
"devDependencies": {
8182
"assets-webpack-plugin": "3.5.1",
82-
"babel-cli": "6.24.0",
83-
"babel-core": "6.24.0",
83+
"babel-cli": "6.24.1",
84+
"babel-core": "6.24.1",
8485
"babel-eslint": "7.2.1",
8586
"babel-jest": "19.0.0",
8687
"babel-loader": "6.4.1",
@@ -89,14 +90,14 @@
8990
"babel-plugin-transform-react-jsx-self": "6.22.0",
9091
"babel-plugin-transform-react-jsx-source": "6.22.0",
9192
"babel-polyfill": "6.23.0",
92-
"babel-preset-env": "1.3.2",
93-
"babel-preset-react": "6.23.0",
94-
"babel-preset-stage-3": "6.22.0",
95-
"babel-template": "6.23.0",
93+
"babel-preset-env": "1.3.3",
94+
"babel-preset-react": "6.24.1",
95+
"babel-preset-stage-3": "6.24.1",
96+
"babel-template": "6.24.1",
9697
"chokidar": "1.6.1",
9798
"css-loader": "0.28.0",
98-
"enzyme": "2.8.0",
99-
"enzyme-to-json": "1.5.0",
99+
"enzyme": "2.8.2",
100+
"enzyme-to-json": "1.5.1",
100101
"eslint": "3.19.0",
101102
"eslint-config-airbnb": "14.1.0",
102103
"eslint-plugin-import": "2.2.0",
@@ -116,8 +117,9 @@
116117
"prettier": "0.22.0",
117118
"prettier-eslint": "4.4.0",
118119
"prettier-eslint-cli": "3.2.0",
119-
"react-addons-test-utils": "15.4.2",
120+
"react-addons-test-utils": "15.5.1",
120121
"react-hot-loader": "3.0.0-beta.6",
122+
"react-test-renderer": "15.5.4",
121123
"regenerator-runtime": "0.10.3",
122124
"rimraf": "2.6.1",
123125
"semver": "5.3.0",

server/middleware/reactApplication/ServerHTML.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,8 @@
66
/* eslint-disable react/no-danger */
77
/* eslint-disable react/no-array-index-key */
88

9-
import React, { Children, PropTypes } from 'react';
9+
import React, { Children } from 'react';
10+
import PropTypes from 'prop-types';
1011
import serialize from 'serialize-javascript';
1112

1213
import config from '../../../config';

shared/components/DemoApp/Error404/index.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
class Error404 extends Component {
45
componentWillMount() {

shared/components/HTML/index.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
/* eslint-disable react/no-danger */
22

3-
import React, { PropTypes } from 'react';
3+
import React from 'react';
4+
import PropTypes from 'prop-types';
45

56
/**
67
* The is the HTML shell for our React Application.

0 commit comments

Comments
 (0)