From 70dd7dcbfb3a11ad264ae9949a9d7a39e08b2d4e Mon Sep 17 00:00:00 2001 From: SleepWalker Date: Tue, 22 Aug 2017 21:49:50 +0300 Subject: [PATCH] #305: run codemod to migrate from deprecated React.PropTypes to prop-types package --- src/components/accounts/AccountSwitcher.js | 3 ++- src/components/auth/BaseAuthBody.js | 3 ++- src/components/auth/RejectionLink.js | 3 ++- src/components/auth/activation/ActivationBody.js | 3 ++- src/components/auth/authError/AuthError.js | 3 ++- src/components/auth/finish/Finish.js | 3 ++- .../auth/recoverPassword/RecoverPasswordBody.js | 3 ++- src/components/contact/ContactForm.js | 3 ++- src/components/footerMenu/FooterMenu.js | 3 ++- src/components/i18n/IntlProvider.js | 3 ++- src/components/langMenu/LangMenu.js | 3 ++- src/components/profile/ProfileField.js | 9 +++++---- src/components/profile/changePassword/ChangePassword.js | 3 ++- src/components/profile/changeUsername/ChangeUsername.js | 3 ++- .../profile/passwordRequestForm/PasswordRequestForm.js | 3 ++- src/components/ui/form/Captcha.js | 3 ++- src/components/ui/form/Checkbox.js | 3 ++- src/components/ui/form/Dropdown.js | 3 ++- src/components/ui/form/FormError.js | 3 ++- src/components/ui/form/FormInputComponent.js | 3 ++- src/components/ui/form/Input.js | 3 ++- src/components/ui/form/TextArea.js | 3 ++- src/components/ui/loader/ComponentLoader.js | 3 ++- src/components/ui/popup/PopupStack.js | 3 ++- src/components/userbar/Userbar.js | 3 ++- src/pages/profile/ChangeEmailPage.js | 3 ++- src/pages/profile/ChangePasswordPage.js | 3 ++- src/pages/profile/ChangeUsernamePage.js | 3 ++- 28 files changed, 59 insertions(+), 31 deletions(-) diff --git a/src/components/accounts/AccountSwitcher.js b/src/components/accounts/AccountSwitcher.js index 36e369f..ce0f4bd 100644 --- a/src/components/accounts/AccountSwitcher.js +++ b/src/components/accounts/AccountSwitcher.js @@ -1,4 +1,5 @@ -import React, { Component, PropTypes } from 'react'; +import PropTypes from 'prop-types'; +import React, { Component } from 'react'; import classNames from 'classnames'; import { Link } from 'react-router-dom'; diff --git a/src/components/auth/BaseAuthBody.js b/src/components/auth/BaseAuthBody.js index 5537413..d9b72f2 100644 --- a/src/components/auth/BaseAuthBody.js +++ b/src/components/auth/BaseAuthBody.js @@ -1,7 +1,8 @@ /** * Helps with form fields binding, form serialization and errors rendering */ -import React, { Component, PropTypes } from 'react'; +import PropTypes from 'prop-types'; +import React, { Component } from 'react'; import AuthError from 'components/auth/authError/AuthError'; import { userShape } from 'components/user/User'; diff --git a/src/components/auth/RejectionLink.js b/src/components/auth/RejectionLink.js index 5806311..c1bc340 100644 --- a/src/components/auth/RejectionLink.js +++ b/src/components/auth/RejectionLink.js @@ -1,4 +1,5 @@ -import React, { PropTypes } from 'react'; +import PropTypes from 'prop-types'; +import React from 'react'; import { FormattedMessage as Message } from 'react-intl'; diff --git a/src/components/auth/activation/ActivationBody.js b/src/components/auth/activation/ActivationBody.js index c605695..6f0c156 100644 --- a/src/components/auth/activation/ActivationBody.js +++ b/src/components/auth/activation/ActivationBody.js @@ -1,4 +1,5 @@ -import React, { PropTypes } from 'react'; +import PropTypes from 'prop-types'; +import React from 'react'; import { FormattedMessage as Message } from 'react-intl'; diff --git a/src/components/auth/authError/AuthError.js b/src/components/auth/authError/AuthError.js index feee163..7f4dd3e 100644 --- a/src/components/auth/authError/AuthError.js +++ b/src/components/auth/authError/AuthError.js @@ -1,4 +1,5 @@ -import React, { PropTypes } from 'react'; +import PropTypes from 'prop-types'; +import React from 'react'; import errorsDict from 'services/errorsDict'; import { PanelBodyHeader } from 'components/ui/Panel'; diff --git a/src/components/auth/finish/Finish.js b/src/components/auth/finish/Finish.js index 3bcd9c2..ab79273 100644 --- a/src/components/auth/finish/Finish.js +++ b/src/components/auth/finish/Finish.js @@ -1,4 +1,5 @@ -import React, { Component, PropTypes } from 'react'; +import PropTypes from 'prop-types'; +import React, { Component } from 'react'; import { connect } from 'react-redux'; import { FormattedMessage as Message } from 'react-intl'; diff --git a/src/components/auth/recoverPassword/RecoverPasswordBody.js b/src/components/auth/recoverPassword/RecoverPasswordBody.js index 29a4e3b..14797dd 100644 --- a/src/components/auth/recoverPassword/RecoverPasswordBody.js +++ b/src/components/auth/recoverPassword/RecoverPasswordBody.js @@ -1,4 +1,5 @@ -import React, { PropTypes } from 'react'; +import PropTypes from 'prop-types'; +import React from 'react'; import { FormattedMessage as Message } from 'react-intl'; diff --git a/src/components/contact/ContactForm.js b/src/components/contact/ContactForm.js index fc9b3d7..cb49e43 100644 --- a/src/components/contact/ContactForm.js +++ b/src/components/contact/ContactForm.js @@ -1,4 +1,5 @@ -import React, { Component, PropTypes } from 'react'; +import PropTypes from 'prop-types'; +import React, { Component } from 'react'; import classNames from 'classnames'; import { FormattedMessage as Message } from 'react-intl'; diff --git a/src/components/footerMenu/FooterMenu.js b/src/components/footerMenu/FooterMenu.js index 18eb43a..f419ac2 100644 --- a/src/components/footerMenu/FooterMenu.js +++ b/src/components/footerMenu/FooterMenu.js @@ -1,4 +1,5 @@ -import React, { Component, PropTypes } from 'react'; +import PropTypes from 'prop-types'; +import React, { Component } from 'react'; import { Link } from 'react-router-dom'; import { FormattedMessage as Message } from 'react-intl'; diff --git a/src/components/i18n/IntlProvider.js b/src/components/i18n/IntlProvider.js index 87bba7c..d98d227 100644 --- a/src/components/i18n/IntlProvider.js +++ b/src/components/i18n/IntlProvider.js @@ -1,4 +1,5 @@ -import React, { Component, PropTypes } from 'react'; +import PropTypes from 'prop-types'; +import React, { Component } from 'react'; import { IntlProvider as OrigIntlProvider } from 'react-intl'; diff --git a/src/components/langMenu/LangMenu.js b/src/components/langMenu/LangMenu.js index a0722ed..1165e89 100644 --- a/src/components/langMenu/LangMenu.js +++ b/src/components/langMenu/LangMenu.js @@ -1,4 +1,5 @@ -import React, { Component, PropTypes } from 'react'; +import PropTypes from 'prop-types'; +import React, { Component } from 'react'; import ReactDOM from 'react-dom'; import classNames from 'classnames'; diff --git a/src/components/profile/ProfileField.js b/src/components/profile/ProfileField.js index 20a819d..1403565 100644 --- a/src/components/profile/ProfileField.js +++ b/src/components/profile/ProfileField.js @@ -1,4 +1,5 @@ -import React, { Component, PropTypes } from 'react'; +import PropTypes from 'prop-types'; +import React, { Component } from 'react'; import { Link } from 'react-router-dom'; @@ -7,11 +8,11 @@ import styles from './profile.scss'; export default class ProfileField extends Component { static displayName = 'ProfileField'; static propTypes = { - label: React.PropTypes.oneOfType([PropTypes.string, PropTypes.element]).isRequired, + label: PropTypes.oneOfType([PropTypes.string, PropTypes.element]).isRequired, link: PropTypes.string, onChange: PropTypes.func, - value: React.PropTypes.oneOfType([PropTypes.string, PropTypes.element]).isRequired, - warningMessage: React.PropTypes.oneOfType([PropTypes.string, PropTypes.element]) + value: PropTypes.oneOfType([PropTypes.string, PropTypes.element]).isRequired, + warningMessage: PropTypes.oneOfType([PropTypes.string, PropTypes.element]) }; render() { diff --git a/src/components/profile/changePassword/ChangePassword.js b/src/components/profile/changePassword/ChangePassword.js index 38795b7..7192355 100644 --- a/src/components/profile/changePassword/ChangePassword.js +++ b/src/components/profile/changePassword/ChangePassword.js @@ -1,4 +1,5 @@ -import React, { Component, PropTypes } from 'react'; +import PropTypes from 'prop-types'; +import React, { Component } from 'react'; import { FormattedMessage as Message } from 'react-intl'; import Helmet from 'react-helmet'; diff --git a/src/components/profile/changeUsername/ChangeUsername.js b/src/components/profile/changeUsername/ChangeUsername.js index ac55a5f..ba2d368 100644 --- a/src/components/profile/changeUsername/ChangeUsername.js +++ b/src/components/profile/changeUsername/ChangeUsername.js @@ -1,4 +1,5 @@ -import React, { Component, PropTypes } from 'react'; +import PropTypes from 'prop-types'; +import React, { Component } from 'react'; import { FormattedMessage as Message } from 'react-intl'; import Helmet from 'react-helmet'; diff --git a/src/components/profile/passwordRequestForm/PasswordRequestForm.js b/src/components/profile/passwordRequestForm/PasswordRequestForm.js index 00a01dd..3c92485 100644 --- a/src/components/profile/passwordRequestForm/PasswordRequestForm.js +++ b/src/components/profile/passwordRequestForm/PasswordRequestForm.js @@ -1,4 +1,5 @@ -import React, { Component, PropTypes } from 'react'; +import PropTypes from 'prop-types'; +import React, { Component } from 'react'; import { FormattedMessage as Message } from 'react-intl'; diff --git a/src/components/ui/form/Captcha.js b/src/components/ui/form/Captcha.js index f29fb6c..a9545fc 100644 --- a/src/components/ui/form/Captcha.js +++ b/src/components/ui/form/Captcha.js @@ -1,4 +1,5 @@ -import React, { PropTypes } from 'react'; +import PropTypes from 'prop-types'; +import React from 'react'; import classNames from 'classnames'; diff --git a/src/components/ui/form/Checkbox.js b/src/components/ui/form/Checkbox.js index 364046c..5ebddd7 100644 --- a/src/components/ui/form/Checkbox.js +++ b/src/components/ui/form/Checkbox.js @@ -1,4 +1,5 @@ -import React, { PropTypes } from 'react'; +import PropTypes from 'prop-types'; +import React from 'react'; import classNames from 'classnames'; diff --git a/src/components/ui/form/Dropdown.js b/src/components/ui/form/Dropdown.js index 5a0cee8..8fd9905 100644 --- a/src/components/ui/form/Dropdown.js +++ b/src/components/ui/form/Dropdown.js @@ -1,4 +1,5 @@ -import React, { PropTypes } from 'react'; +import PropTypes from 'prop-types'; +import React from 'react'; import ReactDOM from 'react-dom'; import classNames from 'classnames'; diff --git a/src/components/ui/form/FormError.js b/src/components/ui/form/FormError.js index cd58c3b..a3a3a0f 100644 --- a/src/components/ui/form/FormError.js +++ b/src/components/ui/form/FormError.js @@ -1,4 +1,5 @@ -import React, { PropTypes } from 'react'; +import PropTypes from 'prop-types'; +import React from 'react'; import errorsDict from 'services/errorsDict'; diff --git a/src/components/ui/form/FormInputComponent.js b/src/components/ui/form/FormInputComponent.js index a85eb33..515c91e 100644 --- a/src/components/ui/form/FormInputComponent.js +++ b/src/components/ui/form/FormInputComponent.js @@ -1,4 +1,5 @@ -import React, { PropTypes } from 'react'; +import PropTypes from 'prop-types'; +import React from 'react'; import FormComponent from './FormComponent'; import FormError from './FormError'; diff --git a/src/components/ui/form/Input.js b/src/components/ui/form/Input.js index e88e8f2..5311f66 100644 --- a/src/components/ui/form/Input.js +++ b/src/components/ui/form/Input.js @@ -1,4 +1,5 @@ -import React, { PropTypes } from 'react'; +import PropTypes from 'prop-types'; +import React from 'react'; import classNames from 'classnames'; diff --git a/src/components/ui/form/TextArea.js b/src/components/ui/form/TextArea.js index 973c72e..58a322d 100644 --- a/src/components/ui/form/TextArea.js +++ b/src/components/ui/form/TextArea.js @@ -1,4 +1,5 @@ -import React, { PropTypes } from 'react'; +import PropTypes from 'prop-types'; +import React from 'react'; import classNames from 'classnames'; diff --git a/src/components/ui/loader/ComponentLoader.js b/src/components/ui/loader/ComponentLoader.js index b7e259b..9b03919 100644 --- a/src/components/ui/loader/ComponentLoader.js +++ b/src/components/ui/loader/ComponentLoader.js @@ -1,4 +1,5 @@ -import React, { PropTypes } from 'react'; +import PropTypes from 'prop-types'; +import React from 'react'; import classNames from 'classnames'; diff --git a/src/components/ui/popup/PopupStack.js b/src/components/ui/popup/PopupStack.js index 88a5161..2b43f44 100644 --- a/src/components/ui/popup/PopupStack.js +++ b/src/components/ui/popup/PopupStack.js @@ -1,4 +1,5 @@ -import React, { Component, PropTypes } from 'react'; +import PropTypes from 'prop-types'; +import React, { Component } from 'react'; import { CSSTransitionGroup } from 'react-transition-group'; import { browserHistory } from 'services/history'; diff --git a/src/components/userbar/Userbar.js b/src/components/userbar/Userbar.js index d159231..713a460 100644 --- a/src/components/userbar/Userbar.js +++ b/src/components/userbar/Userbar.js @@ -1,4 +1,5 @@ -import React, { Component, PropTypes } from 'react'; +import PropTypes from 'prop-types'; +import React, { Component } from 'react'; import { Link } from 'react-router-dom'; import { FormattedMessage as Message } from 'react-intl'; diff --git a/src/pages/profile/ChangeEmailPage.js b/src/pages/profile/ChangeEmailPage.js index 0528c81..1cbc992 100644 --- a/src/pages/profile/ChangeEmailPage.js +++ b/src/pages/profile/ChangeEmailPage.js @@ -1,4 +1,5 @@ -import React, { Component, PropTypes } from 'react'; +import PropTypes from 'prop-types'; +import React, { Component } from 'react'; import ChangeEmail from 'components/profile/changeEmail/ChangeEmail'; diff --git a/src/pages/profile/ChangePasswordPage.js b/src/pages/profile/ChangePasswordPage.js index 9335960..8c02c02 100644 --- a/src/pages/profile/ChangePasswordPage.js +++ b/src/pages/profile/ChangePasswordPage.js @@ -1,4 +1,5 @@ -import React, { Component, PropTypes } from 'react'; +import PropTypes from 'prop-types'; +import React, { Component } from 'react'; import accounts from 'services/api/accounts'; import { FormModel } from 'components/ui/form'; diff --git a/src/pages/profile/ChangeUsernamePage.js b/src/pages/profile/ChangeUsernamePage.js index d05bac8..6d2aeee 100644 --- a/src/pages/profile/ChangeUsernamePage.js +++ b/src/pages/profile/ChangeUsernamePage.js @@ -1,4 +1,5 @@ -import React, { Component, PropTypes } from 'react'; +import PropTypes from 'prop-types'; +import React, { Component } from 'react'; import accounts from 'services/api/accounts'; import { FormModel } from 'components/ui/form';