Skip to content

Commit

Permalink
Prepare React 15.5 (mui#413)
Browse files Browse the repository at this point in the history
* 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
  • Loading branch information
birkir authored and ctrlplusb committed Apr 15, 2017
1 parent ab73cb3 commit 09c2d0f
Show file tree
Hide file tree
Showing 6 changed files with 196 additions and 129 deletions.
3 changes: 2 additions & 1 deletion config/components/ClientConfig.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import React from 'react';
import PropTypes from 'prop-types';
import serialize from 'serialize-javascript';
import filterWithRules from '../../shared/utils/objects/filterWithRules';
import values from '../values';
Expand Down Expand Up @@ -35,7 +36,7 @@ function ClientConfig({ nonce }) {
}

ClientConfig.propTypes = {
nonce: React.PropTypes.string.isRequired,
nonce: PropTypes.string.isRequired,
};

export default ClientConfig;
30 changes: 16 additions & 14 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -68,19 +68,20 @@
"modernizr": "3.4.0",
"normalize.css": "6.0.0",
"offline-plugin": "4.6.2",
"react": "15.4.2",
"prop-types": "15.5.8",
"react": "15.5.4",
"react-async-bootstrapper": "1.1.1",
"react-async-component": "1.0.0-beta.2",
"react-dom": "15.4.2",
"react-helmet": "5.0.2",
"react-router-dom": "4.0.0",
"react-async-component": "1.0.0-beta.3",
"react-dom": "15.5.4",
"react-helmet": "5.0.3",
"react-router-dom": "4.1.1",
"serialize-javascript": "1.3.0",
"uuid": "3.0.1"
},
"devDependencies": {
"assets-webpack-plugin": "3.5.1",
"babel-cli": "6.24.0",
"babel-core": "6.24.0",
"babel-cli": "6.24.1",
"babel-core": "6.24.1",
"babel-eslint": "7.2.1",
"babel-jest": "19.0.0",
"babel-loader": "6.4.1",
Expand All @@ -89,14 +90,14 @@
"babel-plugin-transform-react-jsx-self": "6.22.0",
"babel-plugin-transform-react-jsx-source": "6.22.0",
"babel-polyfill": "6.23.0",
"babel-preset-env": "1.3.2",
"babel-preset-react": "6.23.0",
"babel-preset-stage-3": "6.22.0",
"babel-template": "6.23.0",
"babel-preset-env": "1.3.3",
"babel-preset-react": "6.24.1",
"babel-preset-stage-3": "6.24.1",
"babel-template": "6.24.1",
"chokidar": "1.6.1",
"css-loader": "0.28.0",
"enzyme": "2.8.0",
"enzyme-to-json": "1.5.0",
"enzyme": "2.8.2",
"enzyme-to-json": "1.5.1",
"eslint": "3.19.0",
"eslint-config-airbnb": "14.1.0",
"eslint-plugin-import": "2.2.0",
Expand All @@ -116,8 +117,9 @@
"prettier": "0.22.0",
"prettier-eslint": "4.4.0",
"prettier-eslint-cli": "3.2.0",
"react-addons-test-utils": "15.4.2",
"react-addons-test-utils": "15.5.1",
"react-hot-loader": "3.0.0-beta.6",
"react-test-renderer": "15.5.4",
"regenerator-runtime": "0.10.3",
"rimraf": "2.6.1",
"semver": "5.3.0",
Expand Down
3 changes: 2 additions & 1 deletion server/middleware/reactApplication/ServerHTML.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,8 @@
/* eslint-disable react/no-danger */
/* eslint-disable react/no-array-index-key */

import React, { Children, PropTypes } from 'react';
import React, { Children } from 'react';
import PropTypes from 'prop-types';
import serialize from 'serialize-javascript';

import config from '../../../config';
Expand Down
3 changes: 2 additions & 1 deletion shared/components/DemoApp/Error404/index.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import React, { Component, PropTypes } from 'react';
import React, { Component } from 'react';
import PropTypes from 'prop-types';

class Error404 extends Component {
componentWillMount() {
Expand Down
3 changes: 2 additions & 1 deletion shared/components/HTML/index.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
/* eslint-disable react/no-danger */

import React, { PropTypes } from 'react';
import React from 'react';
import PropTypes from 'prop-types';

/**
* The is the HTML shell for our React Application.
Expand Down
Loading

0 comments on commit 09c2d0f

Please sign in to comment.