Upgrading usage of prop-types to new package

package.json

@@ -101,9 +101,10 @@
     "immutable": "^3.7.3",
     "jsonp": "^0.2.0",
     "password-sheriff": "^1.1.0",
-    "react": "^15.0.0 || ^16.0.0",
-    "react-addons-css-transition-group": "^15.0.0 || ^16.0.0",
-    "react-dom": "^15.0.0 || ^16.0.0",
+    "prop-types": "^15.5.7 || ^16.0.0",
+    "react": "^15.3.0 || ^16.0.0",
+    "react-addons-css-transition-group": "^15.3.0 || ^16.0.0",
+    "react-dom": "^15.3.0 || ^16.0.0",
     "superagent": "^3.3.1",
     "trim": "0.0.1",
     "url-join": "^1.1.0"

src/connection/database/login_pane.jsx

@@ -1,3 +1,4 @@
+import PropTypes from 'prop-types';
 import React from 'react';
 import EmailPane from '../../field/email/email_pane';
 import UsernamePane from '../../field/username/username_pane';
@@ -72,14 +73,14 @@ export default class LoginPane extends React.Component {
 }
 
 LoginPane.propTypes = {
-  emailInputPlaceholder: React.PropTypes.string.isRequired,
-  forgotPasswordAction: React.PropTypes.string.isRequired,
-  i18n: React.PropTypes.object.isRequired,
-  instructions: React.PropTypes.any,
-  lock: React.PropTypes.object.isRequired,
-  passwordInputPlaceholder: React.PropTypes.string.isRequired,
-  showForgotPasswordLink: React.PropTypes.bool.isRequired,
-  showPassword: React.PropTypes.bool.isRequired,
-  usernameInputPlaceholder: React.PropTypes.string.isRequired,
-  usernameStyle: React.PropTypes.oneOf(["any", "email", "username"])
+  emailInputPlaceholder: PropTypes.string.isRequired,
+  forgotPasswordAction: PropTypes.string.isRequired,
+  i18n: PropTypes.object.isRequired,
+  instructions: PropTypes.any,
+  lock: PropTypes.object.isRequired,
+  passwordInputPlaceholder: PropTypes.string.isRequired,
+  showForgotPasswordLink: PropTypes.bool.isRequired,
+  showPassword: PropTypes.bool.isRequired,
+  usernameInputPlaceholder: PropTypes.string.isRequired,
+  usernameStyle: PropTypes.oneOf(["any", "email", "username"])
 };

src/connection/database/login_sign_up_tabs.jsx

@@ -1,3 +1,4 @@
+import PropTypes from 'prop-types';
 import React from 'react';
 import { showLoginActivity, showSignUpActivity } from './actions';
 import * as l from '../../core/index';
@@ -53,10 +54,10 @@ export default class LoginSignUpTabs extends React.Component {
 }
 
 LoginSignUpTabs.propTypes = {
-  lock: React.PropTypes.object.isRequired,
-  loginLabel: React.PropTypes.string.isRequired,
-  signUpLabel: React.PropTypes.string.isRequired,
-  signUpLink: React.PropTypes.string
+  lock: PropTypes.object.isRequired,
+  loginLabel: PropTypes.string.isRequired,
+  signUpLabel: PropTypes.string.isRequired,
+  signUpLink: PropTypes.string
 };
 
 class LoginSignUpTab extends React.Component {

src/connection/database/mfa_pane.jsx

@@ -1,3 +1,4 @@
+import PropTypes from 'prop-types';
 import React from 'react';
 import MFACodePane from '../../field/mfa-code/mfa_code_pane';
 
@@ -29,9 +30,9 @@ export default class MFAPane extends React.Component {
 }
 
 MFAPane.propTypes = {
-  mfaInputPlaceholder: React.PropTypes.string.isRequired,
-  title: React.PropTypes.string.isRequired,
-  i18n: React.PropTypes.object.isRequired,
-  instructions: React.PropTypes.any,
-  lock: React.PropTypes.object.isRequired
+  mfaInputPlaceholder: PropTypes.string.isRequired,
+  title: PropTypes.string.isRequired,
+  i18n: PropTypes.object.isRequired,
+  instructions: PropTypes.any,
+  lock: PropTypes.object.isRequired
 };

src/connection/database/password_reset_confirmation.jsx

@@ -1,3 +1,4 @@
+import PropTypes from 'prop-types';
 import React from 'react';
 import SuccessPane from '../../ui/box/success_pane';
 import { closeLock } from '../../core/actions';
@@ -25,8 +26,8 @@ export default class PasswordResetConfirmation extends React.Component {
 }
 
 PasswordResetConfirmation.propTypes = {
-  closeHandler: React.PropTypes.func.isRequired,
-  lock: React.PropTypes.object.isRequired
+  closeHandler: PropTypes.func.isRequired,
+  lock: PropTypes.object.isRequired
 };
 
 export function renderPasswordResetConfirmation(m, props = {}) {

src/connection/database/reset_password_pane.jsx

@@ -1,11 +1,12 @@
+import PropTypes from 'prop-types';
 import React from 'react';
 import EmailPane from '../../field/email/email_pane';
 import * as l from '../../core/index';
 
 export default class ResetPasswordPane extends React.Component {
   static propTypes = {
-    emailInputPlaceholder: React.PropTypes.string.isRequired,
-    lock: React.PropTypes.object.isRequired
+    emailInputPlaceholder: PropTypes.string.isRequired,
+    lock: PropTypes.object.isRequired
   };
 
   render() {

src/connection/database/signed_up_confirmation.jsx

@@ -1,3 +1,4 @@
+import PropTypes from 'prop-types';
 import React from 'react';
 import SuccessPane from '../../ui/box/success_pane';
 import { closeLock } from '../../core/actions';
@@ -26,8 +27,8 @@ export default class SignedUpConfirmation extends React.Component {
 }
 
 SignedUpConfirmation.propTypes = {
-  closeHandler: React.PropTypes.func.isRequired,
-  lock: React.PropTypes.object.isRequired
+  closeHandler: PropTypes.func.isRequired,
+  lock: PropTypes.object.isRequired
 };
 
 export function renderSignedUpConfirmation(m, props = {}) {

src/connection/enterprise/hrd_pane.jsx

@@ -1,3 +1,4 @@
+import PropTypes from 'prop-types';
 import React from 'react';
 import UsernamePane from '../../field/username/username_pane';
 import PasswordPane from '../../field/password/password_pane';
@@ -35,9 +36,9 @@ export default class HRDPane extends React.Component {
 }
 
 HRDPane.propTypes = {
-  header: React.PropTypes.element,
-  i18n: React.PropTypes.object.isRequired,
-  model: React.PropTypes.object.isRequired,
-  passwordInputPlaceholder: React.PropTypes.string.isRequired,
-  usernameInputPlaceholder: React.PropTypes.string.isRequired
+  header: PropTypes.element,
+  i18n: PropTypes.object.isRequired,
+  model: PropTypes.object.isRequired,
+  passwordInputPlaceholder: PropTypes.string.isRequired,
+  usernameInputPlaceholder: PropTypes.string.isRequired
 };

src/core/error_screen.jsx

@@ -1,3 +1,4 @@
+import PropTypes from 'prop-types';
 import React from 'react';
 import Screen from './screen';
 import * as l from './index';
@@ -22,5 +23,5 @@ const ErrorPane = ({i18n}) => (
 
 
 ErrorPane.propTypes = {
-  i18n: React.PropTypes.object.isRequired
+  i18n: PropTypes.object.isRequired
 };

src/core/loading_screen.jsx

@@ -1,3 +1,4 @@
+import PropTypes from 'prop-types';
 import React from 'react';
 import Screen from './screen';
 import { pinLoadingPane, unpinLoadingPane } from './actions';
@@ -36,5 +37,5 @@ class LoadingPane extends React.Component {
 }
 
 LoadingPane.propTypes = {
-  model: React.PropTypes.object.isRequired
+  model: PropTypes.object.isRequired
 };

src/core/signed_in_confirmation.jsx

@@ -1,3 +1,4 @@
+import PropTypes from 'prop-types';
 import React from 'react';
 import SuccessPane from '../ui/box/success_pane';
 import { closeLock } from './actions';
@@ -25,8 +26,8 @@ export default class SignedInConfirmation extends React.Component {
 }
 
 SignedInConfirmation.propTypes = {
-  closeHandler: React.PropTypes.func.isRequired,
-  lock: React.PropTypes.object.isRequired
+  closeHandler: PropTypes.func.isRequired,
+  lock: PropTypes.object.isRequired
 };
 
 export function renderSignedInConfirmation(lock, props = {}) {

src/field/email/email_pane.jsx

@@ -1,3 +1,4 @@
+import PropTypes from 'prop-types';
 import React from 'react';
 import EmailInput from '../../ui/input/email_input';
 import * as c from '../index';
@@ -48,7 +49,7 @@ export default class EmailPane extends React.Component {
 }
 
 EmailPane.propTypes = {
-  i18n: React.PropTypes.object.isRequired,
-  lock: React.PropTypes.object.isRequired,
-  placeholder: React.PropTypes.string.isRequired
+  i18n: PropTypes.object.isRequired,
+  lock: PropTypes.object.isRequired,
+  placeholder: PropTypes.string.isRequired
 };

src/field/mfa-code/mfa_code_pane.jsx

@@ -1,3 +1,4 @@
+import PropTypes from 'prop-types';
 import React from 'react';
 import MFACodeInput from '../../ui/input/mfa_code_input';
 import * as c from '../index';
@@ -29,7 +30,7 @@ export default class MFACodePane extends React.Component {
 }
 
 MFACodePane.propTypes = {
-  i18n: React.PropTypes.object.isRequired,
-  lock: React.PropTypes.object.isRequired,
-  placeholder: React.PropTypes.string.isRequired
+  i18n: PropTypes.object.isRequired,
+  lock: PropTypes.object.isRequired,
+  placeholder: PropTypes.string.isRequired
 };

src/field/password/password_pane.jsx

@@ -1,3 +1,4 @@
+import PropTypes from 'prop-types';
 import React from 'react';
 import PasswordInput from '../../ui/input/password_input';
 import * as c from '../index';
@@ -32,10 +33,10 @@ export default class PasswordPane extends React.Component {
 }
 
 PasswordPane.propTypes = {
-  i18n: React.PropTypes.object.isRequired,
-  lock: React.PropTypes.object.isRequired,
-  onChange: React.PropTypes.func,
-  placeholder: React.PropTypes.string.isRequired,
-  policy: React.PropTypes.string,
-  strengthMessages: React.PropTypes.object
+  i18n: PropTypes.object.isRequired,
+  lock: PropTypes.object.isRequired,
+  onChange: PropTypes.func,
+  placeholder: PropTypes.string.isRequired,
+  policy: PropTypes.string,
+  strengthMessages: PropTypes.object
 };

src/field/phone-number/phone_number_pane.jsx

@@ -1,3 +1,4 @@
+import PropTypes from 'prop-types';
 import React from 'react';
 import PhoneNumberInput from '../../ui/input/phone_number_input';
 
@@ -46,7 +47,7 @@ export default class PhoneNumberPane extends React.Component {
 }
 
 PhoneNumberPane.propTypes = {
-  instructions: React.PropTypes.element,
-  lock: React.PropTypes.object.isRequired,
-  placeholder: React.PropTypes.string.isRequired
+  instructions: PropTypes.element,
+  lock: PropTypes.object.isRequired,
+  placeholder: PropTypes.string.isRequired
 };

src/field/social/social_buttons_pane.jsx

@@ -1,3 +1,4 @@
+import PropTypes from 'prop-types';
 import React from 'react';
 import AuthButton from '../../ui/button/auth_button';
 import * as l from '../../core/index';
@@ -61,13 +62,13 @@ export default class SocialButtonsPane extends React.Component {
 }
 
 SocialButtonsPane.propTypes = {
-  bigButtons: React.PropTypes.bool.isRequired,
-  instructions: React.PropTypes.any,
-  labelFn: React.PropTypes.func.isRequired,
-  lock: React.PropTypes.object.isRequired,
-  showLoading: React.PropTypes.bool.isRequired,
-  signUp: React.PropTypes.bool.isRequired,
-  disabled: React.PropTypes.bool,
+  bigButtons: PropTypes.bool.isRequired,
+  instructions: PropTypes.any,
+  labelFn: PropTypes.func.isRequired,
+  lock: PropTypes.object.isRequired,
+  showLoading: PropTypes.bool.isRequired,
+  signUp: PropTypes.bool.isRequired,
+  disabled: PropTypes.bool,
 };
 
 SocialButtonsPane.defaultProps = {

src/field/username/username_pane.jsx

@@ -1,3 +1,4 @@
+import PropTypes from 'prop-types';
 import React from 'react';
 import UsernameInput from '../../ui/input/username_input';
 import * as c from '../index';
@@ -61,11 +62,11 @@ export default class UsernamePane extends React.Component {
 }
 
 UsernamePane.propTypes = {
-  i18n: React.PropTypes.object.isRequired,
-  lock: React.PropTypes.object.isRequired,
-  placeholder: React.PropTypes.string.isRequired,
-  validateFormat: React.PropTypes.bool.isRequired,
-  usernameStyle: React.PropTypes.oneOf(["any", "email", "username"])
+  i18n: PropTypes.object.isRequired,
+  lock: PropTypes.object.isRequired,
+  placeholder: PropTypes.string.isRequired,
+  validateFormat: PropTypes.bool.isRequired,
+  usernameStyle: PropTypes.oneOf(["any", "email", "username"])
 };
 
 UsernamePane.defaultProps = {

src/field/vcode/vcode_pane.jsx

@@ -1,3 +1,4 @@
+import PropTypes from 'prop-types';
 import React from 'react';
 import VcodeInput from '../../ui/input/vcode_input';
 import * as l from '../../core/index';
@@ -50,9 +51,9 @@ export default class VcodePane extends React.Component {
 }
 
 VcodePane.propTypes = {
-  instructions: React.PropTypes.element,
-  lock: React.PropTypes.object.isRequired,
-  placeholder: React.PropTypes.string.isRequired,
-  resendLabel: React.PropTypes.string.isRequired,
-  onRestart: React.PropTypes.func.isRequired
+  instructions: PropTypes.element,
+  lock: PropTypes.object.isRequired,
+  placeholder: PropTypes.string.isRequired,
+  resendLabel: PropTypes.string.isRequired,
+  onRestart: PropTypes.func.isRequired
 };

src/ui/box/button.jsx

@@ -1,3 +1,4 @@
+import PropTypes from 'prop-types';
 import React from 'react';
 
 const svgs = {
@@ -15,9 +16,9 @@ const IconButton = ({name, onClick, svg}) => (
 );
 
 IconButton.propTypes = {
-  name: React.PropTypes.string.isRequired,
-  onClick: React.PropTypes.func.isRequired,
-  svg: React.PropTypes.string.isRequired
+  name: PropTypes.string.isRequired,
+  onClick: PropTypes.func.isRequired,
+  svg: PropTypes.string.isRequired
 };
 
 // const createButton = name => {
@@ -39,13 +40,13 @@ export const CloseButton = ({onClick}) => (
 );
 
 CloseButton.propTypes = {
-  onClick: React.PropTypes.func.isRequired
+  onClick: PropTypes.func.isRequired
 };
 
 export const BackButton = ({onClick}) => (
   <IconButton name="back" svg={svgs["back"]} onClick={onClick} />
 );
 
 BackButton.propTypes = {
-  onClick: React.PropTypes.func.isRequired
+  onClick: PropTypes.func.isRequired
 };