Updating JS node modules that are directly related to react (react, redux, react-router, etc.) (shakacode#414)

Author: tmobaird

client/app/bundles/comments/components/CommentBox/CommentBox.jsx

@@ -1,4 +1,5 @@
-import React, { PropTypes } from 'react';
+import React from 'react';
+import PropTypes from 'prop-types';
 import Immutable from 'immutable';
 import ActionCable from 'actioncable';
 import _ from 'lodash';
@@ -15,13 +16,13 @@ class CommentBox extends BaseComponent {
  static propTypes = {
  pollInterval: PropTypes.number.isRequired,
  actions: PropTypes.shape({
- fetchComments: React.PropTypes.function,
+ fetchComments: PropTypes.function,
  }),
  data: PropTypes.shape({
- isFetching: React.PropTypes.boolean,
- isSaving: React.PropTypes.boolean,
- submitCommentError: React.PropTypes.string,
- $$comments: React.PropTypes.arrayOf(CommentPropTypes),
+ isFetching: PropTypes.boolean,
+ isSaving: PropTypes.boolean,
+ submitCommentError: PropTypes.string,
+ $$comments: PropTypes.arrayOf(CommentPropTypes),
  }).isRequired,
  intl: intlShape.isRequired,
  };

client/app/bundles/comments/components/CommentBox/CommentForm/CommentForm.jsx

@@ -1,7 +1,8 @@
 // NOTE: https://github.com/react-bootstrap/react-bootstrap/issues/1850 seesm to require string
 // refs and not the callback kind.
 /* eslint-disable react/no-find-dom-node, react/no-string-refs */
-import React, { PropTypes } from 'react';
+import React from 'react';
+import PropTypes from 'prop-types';
 import ReactDOM from 'react-dom';
 import Col from 'react-bootstrap/lib/Col';
 import FormControl from 'react-bootstrap/lib/FormControl';

client/app/bundles/comments/components/CommentBox/CommentList/Comment/Comment.jsx

@@ -1,5 +1,6 @@
 import BaseComponent from 'libs/components/BaseComponent';
-import React, { PropTypes } from 'react';
+import React from 'react';
+import PropTypes from 'prop-types';
 
 import marked from 'marked';
 import css from './Comment.scss';

client/app/bundles/comments/components/CommentBox/CommentList/CommentList.jsx

@@ -1,7 +1,8 @@
 import Alert from 'react-bootstrap/lib/Alert';
 import BaseComponent from 'libs/components/BaseComponent';
 import Immutable from 'immutable';
-import React, { PropTypes } from 'react';
+import React from 'react';
+import PropTypes from 'prop-types';
 import ReactCSSTransitionGroup from 'react-addons-css-transition-group';
 import _ from 'lodash';
 

client/app/bundles/comments/components/CommentScreen/CommentScreen.jsx

@@ -1,4 +1,5 @@
-import React, { PropTypes } from 'react';
+import React from 'react';
+import PropTypes from 'prop-types';
 
 import BaseComponent from 'libs/components/BaseComponent';
 

client/app/bundles/comments/components/NavigationBar/CommentsCount.jsx

@@ -1,4 +1,5 @@
-import React, { PropTypes } from 'react';
+import React from 'react';
+import PropTypes from 'prop-types';
 
 const href = 'https://github.com/shakacode/react_on_rails/blob/master/README.md#multiple-react-' +
  'components-on-a-page-with-one-store';

client/app/bundles/comments/components/NavigationBar/NavigationBar.jsx

@@ -3,7 +3,8 @@
 
 import classNames from 'classnames';
 import _ from 'lodash';
-import React, { PropTypes } from 'react';
+import React from 'react';
+import PropTypes from 'prop-types';
 
 import CommentsCount from './CommentsCount';
 import * as paths from '../../constants/paths';

client/app/bundles/comments/components/TestReactRouterRedirect/TestReactRouterRedirect.jsx

@@ -1,20 +1,29 @@
 import React from 'react';
+import { Redirect } from 'react-router-dom';
 
 import BaseComponent from 'libs/components/BaseComponent';
 
 export default class TestReactRouterRedirect extends BaseComponent {
- static checkAuth(nextState, replace) {
+
+ static checkAuth() {
  // Hard code this to demonstrate the effect
  const notAuthorized = true;
- if (notAuthorized) {
- replace({ pathname: '/', state: { redirectFrom: nextState.location.pathname } });
- }
+ return notAuthorized;
  }
 
  render() {
- return (
- <div>Nope.</div>
- );
- }
+ if (TestReactRouterRedirect.checkAuth()) {
+ return (
+ <Redirect
+ push
+ to={{
+ pathname: '/',
+ state: { redirectFrom: this.props.location.pathname },
+ }}
+ />
+ );
+ }
 
+ return <div>Nope.</div>;
+ }
 }

client/app/bundles/comments/containers/NavigationBarContainer.jsx

@@ -1,4 +1,5 @@
-import React, { PropTypes } from 'react';
+import React from 'react';
+import PropTypes from 'prop-types';
 import { connect } from 'react-redux';
 
 import BaseComponent from 'libs/components/BaseComponent';

client/app/bundles/comments/containers/NonRouterCommentsContainer.jsx

@@ -1,4 +1,5 @@
-import React, { PropTypes } from 'react';
+import React from 'react';
+import PropTypes from 'prop-types';
 import { connect } from 'react-redux';
 import { bindActionCreators } from 'redux';
 import BaseComponent from 'libs/components/BaseComponent';