diff --git a/src/Routes.js b/src/Routes.js index 756529d3..40b28786 100644 --- a/src/Routes.js +++ b/src/Routes.js @@ -1,4 +1,5 @@ -import React, { Component, PropTypes } from 'react'; // eslint-disable-line react/no-deprecated +import React, { Component } from 'react'; +import PropTypes from 'prop-types'; import { compose } from 'redux'; import { connect } from 'react-redux'; import { Switch, Route, withRouter } from 'react-router-dom'; diff --git a/src/app.js b/src/app.js index 8cad66ce..bf56f000 100644 --- a/src/app.js +++ b/src/app.js @@ -1,4 +1,5 @@ -import React, { PropTypes } from 'react'; // eslint-disable-line react/no-deprecated +import React from 'react'; +import PropTypes from 'prop-types'; import ReactDOMServer from 'react-dom/server'; import Helmet from 'react-helmet'; import { BrowserRouter, StaticRouter } from 'react-router-dom'; diff --git a/src/components/AddImages/AddImages.js b/src/components/AddImages/AddImages.js index cab7105e..ac3c298b 100644 --- a/src/components/AddImages/AddImages.js +++ b/src/components/AddImages/AddImages.js @@ -7,7 +7,8 @@ * * */ -import React, { PropTypes } from 'react'; // eslint-disable-line react/no-deprecated +import React from 'react'; +import PropTypes from 'prop-types'; import { SortableContainer } from 'react-sortable-hoc'; import classNames from 'classnames'; import { ImageFromFile, ResponsiveImage, IconSpinner } from '../../components'; diff --git a/src/components/AddImages/RemoveImageButton.js b/src/components/AddImages/RemoveImageButton.js index 80891789..970320cf 100644 --- a/src/components/AddImages/RemoveImageButton.js +++ b/src/components/AddImages/RemoveImageButton.js @@ -1,4 +1,5 @@ -import React, { PropTypes } from 'react'; // eslint-disable-line react/no-deprecated +import React from 'react'; +import PropTypes from 'prop-types'; import classNames from 'classnames'; import css from './AddImages.css'; diff --git a/src/components/Avatar/Avatar.js b/src/components/Avatar/Avatar.js index 6f680296..2aec0918 100644 --- a/src/components/Avatar/Avatar.js +++ b/src/components/Avatar/Avatar.js @@ -1,4 +1,5 @@ -import React, { PropTypes } from 'react'; // eslint-disable-line react/no-deprecated +import React from 'react'; +import PropTypes from 'prop-types'; import { injectIntl, intlShape } from 'react-intl'; import classNames from 'classnames'; import * as propTypes from '../../util/propTypes'; diff --git a/src/components/BirthdayInputField/BirthdayInputField.js b/src/components/BirthdayInputField/BirthdayInputField.js index 9267cc04..110bdcd7 100644 --- a/src/components/BirthdayInputField/BirthdayInputField.js +++ b/src/components/BirthdayInputField/BirthdayInputField.js @@ -1,4 +1,5 @@ -import React, { Component, PropTypes } from 'react'; // eslint-disable-line react/no-deprecated +import React, { Component } from 'react'; +import PropTypes from 'prop-types'; import { Field } from 'redux-form'; import { injectIntl, intlShape } from 'react-intl'; import classNames from 'classnames'; diff --git a/src/components/BookingBreakdown/BookingBreakdown.js b/src/components/BookingBreakdown/BookingBreakdown.js index 24d39fbc..5afaa1a7 100644 --- a/src/components/BookingBreakdown/BookingBreakdown.js +++ b/src/components/BookingBreakdown/BookingBreakdown.js @@ -2,7 +2,8 @@ * This component will show the booking info and calculated total price. * I.e. dates and other details related to payment decision in receipt format. */ -import React, { PropTypes } from 'react'; // eslint-disable-line react/no-deprecated +import React from 'react'; +import PropTypes from 'prop-types'; import { FormattedMessage, FormattedHTMLMessage, intlShape, injectIntl } from 'react-intl'; import classNames from 'classnames'; import { types } from '../../util/sdkLoader'; diff --git a/src/components/Button/Button.js b/src/components/Button/Button.js index 7389ad25..adda2afa 100644 --- a/src/components/Button/Button.js +++ b/src/components/Button/Button.js @@ -1,4 +1,5 @@ -import React, { PropTypes, Component } from 'react'; // eslint-disable-line react/no-deprecated +import React, { Component } from 'react'; +import PropTypes from 'prop-types'; import classNames from 'classnames'; import { IconSpinner, IconCheckmark } from '../../components'; diff --git a/src/components/CurrencyInputField/CurrencyInputField.example.js b/src/components/CurrencyInputField/CurrencyInputField.example.js index 87d5daf8..440ca64d 100644 --- a/src/components/CurrencyInputField/CurrencyInputField.example.js +++ b/src/components/CurrencyInputField/CurrencyInputField.example.js @@ -1,5 +1,6 @@ /* eslint-disable no-console */ -import React, { PropTypes } from 'react'; // eslint-disable-line react/no-deprecated +import React from 'react'; +import PropTypes from 'prop-types'; import { IntlProvider, addLocaleData } from 'react-intl'; import { reduxForm, propTypes as formPropTypes } from 'redux-form'; import en from 'react-intl/locale-data/en'; diff --git a/src/components/CurrencyInputField/CurrencyInputField.js b/src/components/CurrencyInputField/CurrencyInputField.js index b6d590a3..a3744606 100644 --- a/src/components/CurrencyInputField/CurrencyInputField.js +++ b/src/components/CurrencyInputField/CurrencyInputField.js @@ -3,7 +3,8 @@ * onFocus: renders given value in unformatted manner: "9999,99" * onBlur: formats the given input: "9 999,99 €" */ -import React, { Component, PropTypes } from 'react'; // eslint-disable-line react/no-deprecated +import React, { Component } from 'react'; +import PropTypes from 'prop-types'; import { intlShape, injectIntl } from 'react-intl'; import { Field } from 'redux-form'; import classNames from 'classnames'; diff --git a/src/components/DateInputField/DateInputField.js b/src/components/DateInputField/DateInputField.js index 1ff145b7..36049306 100644 --- a/src/components/DateInputField/DateInputField.js +++ b/src/components/DateInputField/DateInputField.js @@ -3,7 +3,8 @@ * Styles for SingleDatePicker can be found from 'public/reactDates.css'. * CSS modules can't handle global styles so they are currently added separately */ -import React, { Component, PropTypes } from 'react'; // eslint-disable-line react/no-deprecated +import React, { Component } from 'react'; +import PropTypes from 'prop-types'; import { Field } from 'redux-form'; import { intlShape, injectIntl } from 'react-intl'; import { SingleDatePicker, isInclusivelyAfterDay } from 'react-dates'; diff --git a/src/components/DateRangeInputField/DateRangeInput.js b/src/components/DateRangeInputField/DateRangeInput.js index bb184a3d..17306128 100644 --- a/src/components/DateRangeInputField/DateRangeInput.js +++ b/src/components/DateRangeInputField/DateRangeInput.js @@ -4,7 +4,8 @@ * * N.B. *isOutsideRange* in defaultProps is defining what dates are available to booking. */ -import React, { Component, PropTypes } from 'react'; // eslint-disable-line react/no-deprecated +import React, { Component } from 'react'; +import PropTypes from 'prop-types'; import { intlShape, injectIntl } from 'react-intl'; import { DateRangePicker, isInclusivelyAfterDay, isInclusivelyBeforeDay } from 'react-dates'; import classNames from 'classnames'; diff --git a/src/components/DateRangeInputField/DateRangeInputField.js b/src/components/DateRangeInputField/DateRangeInputField.js index 862787f0..0d0c6c57 100644 --- a/src/components/DateRangeInputField/DateRangeInputField.js +++ b/src/components/DateRangeInputField/DateRangeInputField.js @@ -1,4 +1,5 @@ -import React, { Component, PropTypes } from 'react'; // eslint-disable-line react/no-deprecated +import React, { Component } from 'react'; +import PropTypes from 'prop-types'; import { Field } from 'redux-form'; import classNames from 'classnames'; import { START_DATE, END_DATE } from '../../util/dates'; diff --git a/src/components/DateRangeInputField/NextMonthIcon.js b/src/components/DateRangeInputField/NextMonthIcon.js index 849c9de8..87df1076 100644 --- a/src/components/DateRangeInputField/NextMonthIcon.js +++ b/src/components/DateRangeInputField/NextMonthIcon.js @@ -1,4 +1,5 @@ -import React, { PropTypes } from 'react'; // eslint-disable-line react/no-deprecated +import React from 'react'; +import PropTypes from 'prop-types'; import classNames from 'classnames'; import css from './DateRangeInput.css'; diff --git a/src/components/DateRangeInputField/PreviousMonthIcon.js b/src/components/DateRangeInputField/PreviousMonthIcon.js index 24ebbe89..f3d79399 100644 --- a/src/components/DateRangeInputField/PreviousMonthIcon.js +++ b/src/components/DateRangeInputField/PreviousMonthIcon.js @@ -1,4 +1,5 @@ -import React, { PropTypes } from 'react'; // eslint-disable-line react/no-deprecated +import React from 'react'; +import PropTypes from 'prop-types'; import classNames from 'classnames'; import css from './DateRangeInput.css'; diff --git a/src/components/Discussion/Discussion.js b/src/components/Discussion/Discussion.js index f03b6eec..a50aa6d1 100644 --- a/src/components/Discussion/Discussion.js +++ b/src/components/Discussion/Discussion.js @@ -1,5 +1,5 @@ -import React, { Component, PropTypes } from 'react'; // eslint-disable-line react/no-deprecated - +import React, { Component } from 'react'; +import PropTypes from 'prop-types'; import { Button } from '../../components'; import css from './Discussion.css'; diff --git a/src/components/EditListingDescriptionPanel/EditListingDescriptionPanel.js b/src/components/EditListingDescriptionPanel/EditListingDescriptionPanel.js index 23b64786..2e6d89cf 100644 --- a/src/components/EditListingDescriptionPanel/EditListingDescriptionPanel.js +++ b/src/components/EditListingDescriptionPanel/EditListingDescriptionPanel.js @@ -1,4 +1,5 @@ -import React, { PropTypes } from 'react'; // eslint-disable-line react/no-deprecated +import React from 'react'; +import PropTypes from 'prop-types'; import classNames from 'classnames'; import { FormattedMessage } from 'react-intl'; import { ensureListing } from '../../util/data'; diff --git a/src/components/EditListingLocationPanel/EditListingLocationPanel.js b/src/components/EditListingLocationPanel/EditListingLocationPanel.js index a8b0f1cf..038b7703 100644 --- a/src/components/EditListingLocationPanel/EditListingLocationPanel.js +++ b/src/components/EditListingLocationPanel/EditListingLocationPanel.js @@ -1,4 +1,5 @@ -import React, { PropTypes } from 'react'; // eslint-disable-line react/no-deprecated +import React from 'react'; +import PropTypes from 'prop-types'; import classNames from 'classnames'; import { FormattedMessage } from 'react-intl'; import { ensureListing, parseAddress } from '../../util/data'; diff --git a/src/components/EditListingPhotosPanel/EditListingPhotosPanel.js b/src/components/EditListingPhotosPanel/EditListingPhotosPanel.js index b0422d89..5efb3797 100644 --- a/src/components/EditListingPhotosPanel/EditListingPhotosPanel.js +++ b/src/components/EditListingPhotosPanel/EditListingPhotosPanel.js @@ -1,4 +1,5 @@ -import React, { Component, PropTypes } from 'react'; // eslint-disable-line react/no-deprecated +import React, { Component } from 'react'; +import PropTypes from 'prop-types'; import { FormattedMessage } from 'react-intl'; import classNames from 'classnames'; import { omitBy, isUndefined } from 'lodash'; diff --git a/src/components/EditListingPricingPanel/EditListingPricingPanel.js b/src/components/EditListingPricingPanel/EditListingPricingPanel.js index 71a35826..015b3ff3 100644 --- a/src/components/EditListingPricingPanel/EditListingPricingPanel.js +++ b/src/components/EditListingPricingPanel/EditListingPricingPanel.js @@ -1,4 +1,5 @@ -import React, { PropTypes } from 'react'; // eslint-disable-line react/no-deprecated +import React from 'react'; +import PropTypes from 'prop-types'; import classNames from 'classnames'; import { FormattedMessage } from 'react-intl'; import { createSlug } from '../../util/urlHelpers'; diff --git a/src/components/EditListingWizard/EditListingWizard.js b/src/components/EditListingWizard/EditListingWizard.js index e5188d6b..1a024527 100644 --- a/src/components/EditListingWizard/EditListingWizard.js +++ b/src/components/EditListingWizard/EditListingWizard.js @@ -1,4 +1,5 @@ -import React, { PropTypes } from 'react'; // eslint-disable-line react/no-deprecated +import React from 'react'; +import PropTypes from 'prop-types'; import { injectIntl, intlShape } from 'react-intl'; import classNames from 'classnames'; import routeConfiguration from '../../routeConfiguration'; diff --git a/src/components/ExternalLink/ExternalLink.js b/src/components/ExternalLink/ExternalLink.js index 74cea4c8..92ee87b7 100644 --- a/src/components/ExternalLink/ExternalLink.js +++ b/src/components/ExternalLink/ExternalLink.js @@ -1,4 +1,5 @@ -import React, { PropTypes } from 'react'; // eslint-disable-line react/no-deprecated +import React from 'react'; +import PropTypes from 'prop-types'; // External link that opens in a new tab/window, ensuring that the // opened page doesn't have access to the current page. diff --git a/src/components/Form/Form.js b/src/components/Form/Form.js index 3165d5d4..961e205c 100644 --- a/src/components/Form/Form.js +++ b/src/components/Form/Form.js @@ -1,4 +1,5 @@ -import React, { PropTypes } from 'react'; // eslint-disable-line react/no-deprecated +import React from 'react'; +import PropTypes from 'prop-types'; const Form = props => { const { children, ...restProps } = props; diff --git a/src/components/HeroSection/HeroSection.js b/src/components/HeroSection/HeroSection.js index fdfac7b1..3a8d7e02 100644 --- a/src/components/HeroSection/HeroSection.js +++ b/src/components/HeroSection/HeroSection.js @@ -1,4 +1,5 @@ -import React, { PropTypes } from 'react'; // eslint-disable-line react/no-deprecated +import React from 'react'; +import PropTypes from 'prop-types'; import { FormattedMessage } from 'react-intl'; import classNames from 'classnames'; import { stringify } from '../../util/urlHelpers'; diff --git a/src/components/IconBannedUser/IconBannedUser.js b/src/components/IconBannedUser/IconBannedUser.js index 855d348a..dc932c6d 100644 --- a/src/components/IconBannedUser/IconBannedUser.js +++ b/src/components/IconBannedUser/IconBannedUser.js @@ -1,4 +1,5 @@ -import React, { PropTypes } from 'react'; // eslint-disable-line react/no-deprecated +import React from 'react'; +import PropTypes from 'prop-types'; import css from './IconBannedUser.css'; diff --git a/src/components/IconCheckmark/IconCheckmark.js b/src/components/IconCheckmark/IconCheckmark.js index 726db408..377d6e78 100644 --- a/src/components/IconCheckmark/IconCheckmark.js +++ b/src/components/IconCheckmark/IconCheckmark.js @@ -1,4 +1,5 @@ -import React, { PropTypes } from 'react'; // eslint-disable-line react/no-deprecated +import React from 'react'; +import PropTypes from 'prop-types'; import classNames from 'classnames'; import css from './IconCheckMark.css'; diff --git a/src/components/IconClose/IconClose.js b/src/components/IconClose/IconClose.js index b749c05d..b8c9858a 100644 --- a/src/components/IconClose/IconClose.js +++ b/src/components/IconClose/IconClose.js @@ -1,4 +1,5 @@ -import React, { PropTypes } from 'react'; // eslint-disable-line react/no-deprecated +import React from 'react'; +import PropTypes from 'prop-types'; import classNames from 'classnames'; import css from './IconClose.css'; diff --git a/src/components/IconEmailAttention/IconEmailAttention.js b/src/components/IconEmailAttention/IconEmailAttention.js index d50df81d..163c69a6 100644 --- a/src/components/IconEmailAttention/IconEmailAttention.js +++ b/src/components/IconEmailAttention/IconEmailAttention.js @@ -1,4 +1,5 @@ -import React, { PropTypes } from 'react'; // eslint-disable-line react/no-deprecated +import React from 'react'; +import PropTypes from 'prop-types'; import classNames from 'classnames'; import css from './IconEmailAttention.css'; diff --git a/src/components/IconEmailSent/IconEmailSent.js b/src/components/IconEmailSent/IconEmailSent.js index 046a8260..3e022398 100644 --- a/src/components/IconEmailSent/IconEmailSent.js +++ b/src/components/IconEmailSent/IconEmailSent.js @@ -1,4 +1,5 @@ -import React, { PropTypes } from 'react'; // eslint-disable-line react/no-deprecated +import React from 'react'; +import PropTypes from 'prop-types'; import classNames from 'classnames'; import css from './IconEmailSent.css'; diff --git a/src/components/IconEmailSuccess/IconEmailSuccess.js b/src/components/IconEmailSuccess/IconEmailSuccess.js index 8879b2dd..724ae1e6 100644 --- a/src/components/IconEmailSuccess/IconEmailSuccess.js +++ b/src/components/IconEmailSuccess/IconEmailSuccess.js @@ -1,4 +1,5 @@ -import React, { PropTypes } from 'react'; // eslint-disable-line react/no-deprecated +import React from 'react'; +import PropTypes from 'prop-types'; import classNames from 'classnames'; import css from './IconEmailSuccess.css'; diff --git a/src/components/IconKeys/IconKeys.js b/src/components/IconKeys/IconKeys.js index e39d718a..0339b3e7 100644 --- a/src/components/IconKeys/IconKeys.js +++ b/src/components/IconKeys/IconKeys.js @@ -1,4 +1,5 @@ -import React, { PropTypes } from 'react'; // eslint-disable-line react/no-deprecated +import React from 'react'; +import PropTypes from 'prop-types'; const IconKeys = props => { const { className } = props; diff --git a/src/components/IconKeysSuccess/IconKeysSuccess.js b/src/components/IconKeysSuccess/IconKeysSuccess.js index f29749f1..dc6f086e 100644 --- a/src/components/IconKeysSuccess/IconKeysSuccess.js +++ b/src/components/IconKeysSuccess/IconKeysSuccess.js @@ -1,4 +1,5 @@ -import React, { PropTypes } from 'react'; // eslint-disable-line react/no-deprecated +import React from 'react'; +import PropTypes from 'prop-types'; const IconKeysSuccess = props => { const { className } = props; diff --git a/src/components/IconSearch/IconSearch.js b/src/components/IconSearch/IconSearch.js index 7e12da0a..768d228c 100644 --- a/src/components/IconSearch/IconSearch.js +++ b/src/components/IconSearch/IconSearch.js @@ -1,4 +1,5 @@ -import React, { PropTypes } from 'react'; // eslint-disable-line react/no-deprecated +import React from 'react'; +import PropTypes from 'prop-types'; import classNames from 'classnames'; import css from './IconSearch.css'; diff --git a/src/components/IconSpinner/IconSpinner.js b/src/components/IconSpinner/IconSpinner.js index 3d0edd85..3e633a45 100644 --- a/src/components/IconSpinner/IconSpinner.js +++ b/src/components/IconSpinner/IconSpinner.js @@ -1,4 +1,5 @@ -import React, { PropTypes } from 'react'; // eslint-disable-line react/no-deprecated +import React from 'react'; +import PropTypes from 'prop-types'; import classNames from 'classnames'; import css from './IconSpinner.css'; diff --git a/src/components/ImageCarousel/ImageCarousel.js b/src/components/ImageCarousel/ImageCarousel.js index 6f511dca..26f74ca3 100644 --- a/src/components/ImageCarousel/ImageCarousel.js +++ b/src/components/ImageCarousel/ImageCarousel.js @@ -1,4 +1,5 @@ -import React, { Component, PropTypes } from 'react'; // eslint-disable-line react/no-deprecated +import React, { Component } from 'react'; +import PropTypes from 'prop-types'; import { injectIntl, intlShape } from 'react-intl'; import classNames from 'classnames'; import { ResponsiveImage } from '../../components'; diff --git a/src/components/ImageFromFile/ImageFromFile.js b/src/components/ImageFromFile/ImageFromFile.js index f1e9ba8a..a1fbed48 100644 --- a/src/components/ImageFromFile/ImageFromFile.js +++ b/src/components/ImageFromFile/ImageFromFile.js @@ -1,4 +1,5 @@ -import React, { Component, PropTypes } from 'react'; // eslint-disable-line react/no-deprecated +import React, { Component } from 'react'; +import PropTypes from 'prop-types'; import { FormattedMessage } from 'react-intl'; import classNames from 'classnames'; import { Promised } from '../../components'; diff --git a/src/components/LayoutSideNavigation/ContentWrapper.js b/src/components/LayoutSideNavigation/ContentWrapper.js index b2803f8e..e7f4bada 100644 --- a/src/components/LayoutSideNavigation/ContentWrapper.js +++ b/src/components/LayoutSideNavigation/ContentWrapper.js @@ -3,7 +3,8 @@ * and main content. Side navigation (first child) will be shown aside on Desktop and * as sub bar under Topbar on mobile screens. */ -import React, { PropTypes } from 'react'; // eslint-disable-line react/no-deprecated +import React from 'react'; +import PropTypes from 'prop-types'; import classNames from 'classnames'; import css from './LayoutSideNavigation.css'; diff --git a/src/components/LayoutSideNavigation/LayoutSideNavigation.js b/src/components/LayoutSideNavigation/LayoutSideNavigation.js index 142e13b5..011d1e41 100644 --- a/src/components/LayoutSideNavigation/LayoutSideNavigation.js +++ b/src/components/LayoutSideNavigation/LayoutSideNavigation.js @@ -3,7 +3,8 @@ * SideNavWrapper will be shown aside on Desktop layout and * as a sub bar under Topbar on mobile screens. */ -import React, { PropTypes } from 'react'; // eslint-disable-line react/no-deprecated +import React from 'react'; +import PropTypes from 'prop-types'; import classNames from 'classnames'; import TopbarWrapper from './TopbarWrapper'; import SideNavWrapper from './SideNavWrapper'; diff --git a/src/components/LayoutSideNavigation/SideNavWrapper.js b/src/components/LayoutSideNavigation/SideNavWrapper.js index ab07cf93..401fb9f5 100644 --- a/src/components/LayoutSideNavigation/SideNavWrapper.js +++ b/src/components/LayoutSideNavigation/SideNavWrapper.js @@ -3,7 +3,8 @@ * and main content. Side navigation (first child) will be shown aside on Desktop and * as sub bar under Topbar on mobile screens. */ -import React, { PropTypes } from 'react'; // eslint-disable-line react/no-deprecated +import React from 'react'; +import PropTypes from 'prop-types'; import classNames from 'classnames'; import css from './LayoutSideNavigation.css'; diff --git a/src/components/LayoutSideNavigation/TopbarWrapper.js b/src/components/LayoutSideNavigation/TopbarWrapper.js index 5da8a605..aecc98a6 100644 --- a/src/components/LayoutSideNavigation/TopbarWrapper.js +++ b/src/components/LayoutSideNavigation/TopbarWrapper.js @@ -3,7 +3,8 @@ * and main content. Side navigation (first child) will be shown aside on Desktop and * as sub bar under Topbar on mobile screens. */ -import React, { PropTypes } from 'react'; // eslint-disable-line react/no-deprecated +import React from 'react'; +import PropTypes from 'prop-types'; import classNames from 'classnames'; import css from './LayoutSideNavigation.css'; diff --git a/src/components/ListingCard/ListingCard.js b/src/components/ListingCard/ListingCard.js index 40d8a281..81da2b86 100644 --- a/src/components/ListingCard/ListingCard.js +++ b/src/components/ListingCard/ListingCard.js @@ -1,4 +1,5 @@ -import React, { PropTypes } from 'react'; // eslint-disable-line react/no-deprecated +import React from 'react'; +import PropTypes from 'prop-types'; import { FormattedMessage, intlShape, injectIntl } from 'react-intl'; import classNames from 'classnames'; import { NamedLink, ResponsiveImage } from '../../components'; diff --git a/src/components/LocationAutocompleteInput/LocationAutocompleteInput.js b/src/components/LocationAutocompleteInput/LocationAutocompleteInput.js index 412e010e..733547e4 100644 --- a/src/components/LocationAutocompleteInput/LocationAutocompleteInput.js +++ b/src/components/LocationAutocompleteInput/LocationAutocompleteInput.js @@ -1,4 +1,5 @@ -import React, { Component, PropTypes } from 'react'; // eslint-disable-line react/no-deprecated +import React, { Component } from 'react'; +import PropTypes from 'prop-types'; import { Field } from 'redux-form'; import { debounce } from 'lodash'; import classNames from 'classnames'; diff --git a/src/components/ManageListingCard/ManageListingCard.js b/src/components/ManageListingCard/ManageListingCard.js index e862e6e1..bc9d38fa 100644 --- a/src/components/ManageListingCard/ManageListingCard.js +++ b/src/components/ManageListingCard/ManageListingCard.js @@ -1,4 +1,5 @@ -import React, { PropTypes } from 'react'; // eslint-disable-line react/no-deprecated +import React from 'react'; +import PropTypes from 'prop-types'; import { compose } from 'redux'; import { withRouter } from 'react-router-dom'; import { FormattedMessage, intlShape, injectIntl } from 'react-intl'; diff --git a/src/components/ManageListingCard/MenuIcon.js b/src/components/ManageListingCard/MenuIcon.js index bd03c15e..823aa20f 100644 --- a/src/components/ManageListingCard/MenuIcon.js +++ b/src/components/ManageListingCard/MenuIcon.js @@ -1,4 +1,5 @@ -import React, { PropTypes } from 'react'; // eslint-disable-line react/no-deprecated +import React from 'react'; +import PropTypes from 'prop-types'; import classNames from 'classnames'; import css from './ManageListingCard.css'; diff --git a/src/components/Map/Map.js b/src/components/Map/Map.js index 9dc3ceb9..2645a25a 100644 --- a/src/components/Map/Map.js +++ b/src/components/Map/Map.js @@ -1,4 +1,5 @@ -import React, { Component, PropTypes } from 'react'; // eslint-disable-line react/no-deprecated +import React, { Component } from 'react'; +import PropTypes from 'prop-types'; import classNames from 'classnames'; import * as propTypes from '../../util/propTypes'; diff --git a/src/components/MapPanel/MapPanel.js b/src/components/MapPanel/MapPanel.js index dca7a482..d0e00b64 100644 --- a/src/components/MapPanel/MapPanel.js +++ b/src/components/MapPanel/MapPanel.js @@ -1,4 +1,5 @@ -import React, { PropTypes } from 'react'; // eslint-disable-line react/no-deprecated +import React from 'react'; +import PropTypes from 'prop-types'; import { NamedLink } from '../../components'; import css from './MapPanel.css'; diff --git a/src/components/Menu/Menu.js b/src/components/Menu/Menu.js index d9ac71ac..72a3f553 100644 --- a/src/components/Menu/Menu.js +++ b/src/components/Menu/Menu.js @@ -16,7 +16,8 @@ * */ -import React, { Component, PropTypes } from 'react'; // eslint-disable-line react/no-deprecated +import React, { Component } from 'react'; +import PropTypes from 'prop-types'; import classNames from 'classnames'; import { MenuContent, MenuLabel } from '../../components'; diff --git a/src/components/MenuContent/MenuContent.js b/src/components/MenuContent/MenuContent.js index 89e6d917..62d37bc0 100644 --- a/src/components/MenuContent/MenuContent.js +++ b/src/components/MenuContent/MenuContent.js @@ -2,7 +2,8 @@ * MenuContent is a immediate child of Menu component sibling to MenuLabel. * Clicking MenuLabel toggles visibility of MenuContent. */ -import React, { PropTypes } from 'react'; // eslint-disable-line react/no-deprecated +import React from 'react'; +import PropTypes from 'prop-types'; import classNames from 'classnames'; import { MenuItem } from '../../components'; diff --git a/src/components/MenuItem/MenuItem.js b/src/components/MenuItem/MenuItem.js index bf109d45..5fdd2e3c 100644 --- a/src/components/MenuItem/MenuItem.js +++ b/src/components/MenuItem/MenuItem.js @@ -6,7 +6,8 @@ * Example: * Click me */ -import React, { PropTypes } from 'react'; // eslint-disable-line react/no-deprecated +import React from 'react'; +import PropTypes from 'prop-types'; import classNames from 'classnames'; import css from './MenuItem.css'; diff --git a/src/components/MenuLabel/MenuLabel.js b/src/components/MenuLabel/MenuLabel.js index 480e5e3d..fc8580df 100644 --- a/src/components/MenuLabel/MenuLabel.js +++ b/src/components/MenuLabel/MenuLabel.js @@ -2,7 +2,8 @@ * MenuLabel is the only always visible part of Menu. * Clicking it toggles visibility of MenuContent. */ -import React, { Component, PropTypes } from 'react'; // eslint-disable-line react/no-deprecated +import React, { Component } from 'react'; +import PropTypes from 'prop-types'; import classNames from 'classnames'; import css from './MenuLabel.css'; diff --git a/src/components/Modal/Modal.js b/src/components/Modal/Modal.js index 7c85e729..04ab87f6 100644 --- a/src/components/Modal/Modal.js +++ b/src/components/Modal/Modal.js @@ -8,7 +8,8 @@ * * */ -import React, { Component, PropTypes } from 'react'; // eslint-disable-line react/no-deprecated +import React, { Component } from 'react'; +import PropTypes from 'prop-types'; import classNames from 'classnames'; import { FormattedMessage, intlShape, injectIntl } from 'react-intl'; import { Button, IconClose } from '../../components'; diff --git a/src/components/ModalInMobile/ModalInMobile.js b/src/components/ModalInMobile/ModalInMobile.js index c7b16aac..5b007046 100644 --- a/src/components/ModalInMobile/ModalInMobile.js +++ b/src/components/ModalInMobile/ModalInMobile.js @@ -11,7 +11,8 @@ * * */ -import React, { Component, PropTypes } from 'react'; // eslint-disable-line react/no-deprecated +import React, { Component } from 'react'; +import PropTypes from 'prop-types'; import classNames from 'classnames'; import { Modal } from '../../components'; import { withViewport } from '../../util/contextHelpers'; diff --git a/src/components/NamedLink/NamedLink.js b/src/components/NamedLink/NamedLink.js index cc3f49f9..4d39c44e 100644 --- a/src/components/NamedLink/NamedLink.js +++ b/src/components/NamedLink/NamedLink.js @@ -17,7 +17,8 @@ * will be added to the element className if the current URL matches * the one in the generated pathname of the link. */ -import React, { PropTypes } from 'react'; // eslint-disable-line react/no-deprecated +import React from 'react'; +import PropTypes from 'prop-types'; import { Link, withRouter } from 'react-router-dom'; import classNames from 'classnames'; import routeConfiguration from '../../routeConfiguration'; diff --git a/src/components/NamedRedirect/NamedRedirect.js b/src/components/NamedRedirect/NamedRedirect.js index 28f781f4..de5bbe00 100644 --- a/src/components/NamedRedirect/NamedRedirect.js +++ b/src/components/NamedRedirect/NamedRedirect.js @@ -2,7 +2,8 @@ * This component wraps React-Router's Redirect by providing name-based routing. * (Helps to narrow down the scope of possible format changes to routes.) */ -import React, { PropTypes } from 'react'; // eslint-disable-line react/no-deprecated +import React from 'react'; +import PropTypes from 'prop-types'; import { Redirect } from 'react-router-dom'; import routeConfiguration from '../../routeConfiguration'; import { pathByRouteName } from '../../util/routes'; diff --git a/src/components/NotificationBadge/NotificationBadge.js b/src/components/NotificationBadge/NotificationBadge.js index 7323b4a1..068f1ad4 100644 --- a/src/components/NotificationBadge/NotificationBadge.js +++ b/src/components/NotificationBadge/NotificationBadge.js @@ -1,4 +1,5 @@ -import React, { PropTypes } from 'react'; // eslint-disable-line react/no-deprecated +import React from 'react'; +import PropTypes from 'prop-types'; import classNames from 'classnames'; import css from './NotificationBadge.css'; diff --git a/src/components/OrderDetailsPanel/OrderDetailsPanel.js b/src/components/OrderDetailsPanel/OrderDetailsPanel.js index c9624343..40d919c7 100644 --- a/src/components/OrderDetailsPanel/OrderDetailsPanel.js +++ b/src/components/OrderDetailsPanel/OrderDetailsPanel.js @@ -1,4 +1,5 @@ -import React, { PropTypes } from 'react'; // eslint-disable-line react/no-deprecated +import React from 'react'; +import PropTypes from 'prop-types'; import { injectIntl, intlShape, FormattedDate, FormattedMessage } from 'react-intl'; import classNames from 'classnames'; import * as propTypes from '../../util/propTypes'; diff --git a/src/components/OrderDiscussionPanel/OrderDiscussionPanel.js b/src/components/OrderDiscussionPanel/OrderDiscussionPanel.js index df4a1bfd..0bd9296a 100644 --- a/src/components/OrderDiscussionPanel/OrderDiscussionPanel.js +++ b/src/components/OrderDiscussionPanel/OrderDiscussionPanel.js @@ -1,4 +1,5 @@ -import React, { PropTypes } from 'react'; // eslint-disable-line react/no-deprecated +import React from 'react'; +import PropTypes from 'prop-types'; import { Discussion } from '../../components'; const OrderDiscussionPanel = props => { diff --git a/src/components/Page/Page.js b/src/components/Page/Page.js index 9a5644dc..5799bb17 100644 --- a/src/components/Page/Page.js +++ b/src/components/Page/Page.js @@ -1,4 +1,5 @@ -import React, { Component, PropTypes } from 'react'; // eslint-disable-line react/no-deprecated +import React, { Component } from 'react'; +import PropTypes from 'prop-types'; import Helmet from 'react-helmet'; import { withRouter } from 'react-router-dom'; import { FormattedMessage, injectIntl, intlShape } from 'react-intl'; diff --git a/src/components/PaginationLinks/NextPageIcon.js b/src/components/PaginationLinks/NextPageIcon.js index 11e6b8f1..47b49052 100644 --- a/src/components/PaginationLinks/NextPageIcon.js +++ b/src/components/PaginationLinks/NextPageIcon.js @@ -1,4 +1,5 @@ -import React, { PropTypes } from 'react'; // eslint-disable-line react/no-deprecated +import React from 'react'; +import PropTypes from 'prop-types'; const NextPageIcon = props => { const { className } = props; diff --git a/src/components/PaginationLinks/PaginationLinks.example.js b/src/components/PaginationLinks/PaginationLinks.example.js index a47b25be..32d3f6a2 100644 --- a/src/components/PaginationLinks/PaginationLinks.example.js +++ b/src/components/PaginationLinks/PaginationLinks.example.js @@ -1,4 +1,5 @@ -import React, { PropTypes } from 'react'; // eslint-disable-line react/no-deprecated +import React from 'react'; +import PropTypes from 'prop-types'; import { withRouter } from 'react-router-dom'; import { parse } from '../../util/urlHelpers'; import PaginationLinks from './PaginationLinks'; diff --git a/src/components/PaginationLinks/PaginationLinks.js b/src/components/PaginationLinks/PaginationLinks.js index 4f4ea603..ae7185b2 100644 --- a/src/components/PaginationLinks/PaginationLinks.js +++ b/src/components/PaginationLinks/PaginationLinks.js @@ -1,4 +1,5 @@ -import React, { PropTypes } from 'react'; // eslint-disable-line react/no-deprecated +import React from 'react'; +import PropTypes from 'prop-types'; import { injectIntl, intlShape } from 'react-intl'; import classNames from 'classnames'; import { range } from 'lodash'; diff --git a/src/components/PaginationLinks/PrevPageIcon.js b/src/components/PaginationLinks/PrevPageIcon.js index 661460d9..2bb4f0c0 100644 --- a/src/components/PaginationLinks/PrevPageIcon.js +++ b/src/components/PaginationLinks/PrevPageIcon.js @@ -1,4 +1,5 @@ -import React, { PropTypes } from 'react'; // eslint-disable-line react/no-deprecated +import React from 'react'; +import PropTypes from 'prop-types'; const PrevPageIcon = props => { const { className } = props; diff --git a/src/components/Promised/Promised.js b/src/components/Promised/Promised.js index 6e39e380..7d3e5283 100644 --- a/src/components/Promised/Promised.js +++ b/src/components/Promised/Promised.js @@ -7,7 +7,8 @@ */ /* eslint-disable no-underscore-dangle */ -import { Component, PropTypes } from 'react'; // eslint-disable-line react/no-deprecated +import { Component } from 'react'; +import PropTypes from 'prop-types'; class Promised extends Component { constructor(props) { diff --git a/src/components/ResponsiveImage/NoImageIcon.js b/src/components/ResponsiveImage/NoImageIcon.js index 9961cb9e..b7b1d468 100644 --- a/src/components/ResponsiveImage/NoImageIcon.js +++ b/src/components/ResponsiveImage/NoImageIcon.js @@ -1,4 +1,5 @@ -import React, { PropTypes } from 'react'; // eslint-disable-line react/no-deprecated +import React from 'react'; +import PropTypes from 'prop-types'; const NoImageIcon = props => { const { className } = props; diff --git a/src/components/ResponsiveImage/ResponsiveImage.js b/src/components/ResponsiveImage/ResponsiveImage.js index b01000d9..c365dd78 100644 --- a/src/components/ResponsiveImage/ResponsiveImage.js +++ b/src/components/ResponsiveImage/ResponsiveImage.js @@ -30,7 +30,8 @@ * // Browser decides which image it will fetch based on current screen size. */ -import React, { PropTypes } from 'react'; // eslint-disable-line react/no-deprecated +import React from 'react'; +import PropTypes from 'prop-types'; import classNames from 'classnames'; import { FormattedMessage } from 'react-intl'; import * as propTypes from '../../util/propTypes'; diff --git a/src/components/SaleDetailsPanel/SaleDetailsPanel.js b/src/components/SaleDetailsPanel/SaleDetailsPanel.js index 08e43957..968c6096 100644 --- a/src/components/SaleDetailsPanel/SaleDetailsPanel.js +++ b/src/components/SaleDetailsPanel/SaleDetailsPanel.js @@ -1,4 +1,5 @@ -import React, { PropTypes } from 'react'; // eslint-disable-line react/no-deprecated +import React from 'react'; +import PropTypes from 'prop-types'; import { injectIntl, intlShape, FormattedDate, FormattedMessage } from 'react-intl'; import classNames from 'classnames'; import * as propTypes from '../../util/propTypes'; diff --git a/src/components/SearchMap/SearchMap.js b/src/components/SearchMap/SearchMap.js index e9415ce3..a66f87d2 100644 --- a/src/components/SearchMap/SearchMap.js +++ b/src/components/SearchMap/SearchMap.js @@ -1,4 +1,5 @@ -import React, { Component, PropTypes } from 'react'; // eslint-disable-line react/no-deprecated +import React, { Component } from 'react'; +import PropTypes from 'prop-types'; import { withGoogleMap, GoogleMap } from 'react-google-maps'; import classNames from 'classnames'; import { groupBy, isEqual, reduce } from 'lodash'; diff --git a/src/components/SearchMapGroupLabel/SearchMapGroupLabel.js b/src/components/SearchMapGroupLabel/SearchMapGroupLabel.js index 2702a291..f1585899 100644 --- a/src/components/SearchMapGroupLabel/SearchMapGroupLabel.js +++ b/src/components/SearchMapGroupLabel/SearchMapGroupLabel.js @@ -1,4 +1,5 @@ -import React, { Component, PropTypes } from 'react'; // eslint-disable-line react/no-deprecated +import React, { Component } from 'react'; +import PropTypes from 'prop-types'; import { OverlayView } from 'react-google-maps'; import classNames from 'classnames'; import * as propTypes from '../../util/propTypes'; diff --git a/src/components/SearchMapInfoCard/SearchMapInfoCard.js b/src/components/SearchMapInfoCard/SearchMapInfoCard.js index d0dbf163..c602393f 100644 --- a/src/components/SearchMapInfoCard/SearchMapInfoCard.js +++ b/src/components/SearchMapInfoCard/SearchMapInfoCard.js @@ -1,4 +1,5 @@ -import React, { Component, PropTypes } from 'react'; // eslint-disable-line react/no-deprecated +import React, { Component } from 'react'; +import PropTypes from 'prop-types'; import { OverlayView } from 'react-google-maps'; import { compose } from 'redux'; import { withRouter } from 'react-router-dom'; diff --git a/src/components/SearchMapPriceLabel/SearchMapPriceLabel.js b/src/components/SearchMapPriceLabel/SearchMapPriceLabel.js index b66a9264..0cf3ef17 100644 --- a/src/components/SearchMapPriceLabel/SearchMapPriceLabel.js +++ b/src/components/SearchMapPriceLabel/SearchMapPriceLabel.js @@ -1,4 +1,5 @@ -import React, { Component, PropTypes } from 'react'; // eslint-disable-line react/no-deprecated +import React, { Component } from 'react'; +import PropTypes from 'prop-types'; import { OverlayView } from 'react-google-maps'; import { injectIntl, intlShape } from 'react-intl'; import classNames from 'classnames'; diff --git a/src/components/SearchResultsPanel/SearchResultsPanel.js b/src/components/SearchResultsPanel/SearchResultsPanel.js index 00e20762..bafb3067 100644 --- a/src/components/SearchResultsPanel/SearchResultsPanel.js +++ b/src/components/SearchResultsPanel/SearchResultsPanel.js @@ -1,4 +1,5 @@ -import React, { PropTypes } from 'react'; // eslint-disable-line react/no-deprecated +import React from 'react'; +import PropTypes from 'prop-types'; import classNames from 'classnames'; import * as propTypes from '../../util/propTypes'; import { ListingCard, PaginationLinks } from '../../components'; diff --git a/src/components/SelectField/SelectField.js b/src/components/SelectField/SelectField.js index 08846ced..c912a537 100644 --- a/src/components/SelectField/SelectField.js +++ b/src/components/SelectField/SelectField.js @@ -1,4 +1,5 @@ -import React, { PropTypes } from 'react'; // eslint-disable-line react/no-deprecated +import React from 'react'; +import PropTypes from 'prop-types'; import { Field } from 'redux-form'; import classNames from 'classnames'; import { ValidationError } from '../../components'; diff --git a/src/components/StripeBankAccountTokenInputField/StripeBankAccountRequiredInput.js b/src/components/StripeBankAccountTokenInputField/StripeBankAccountRequiredInput.js index 11c907c6..3522b617 100644 --- a/src/components/StripeBankAccountTokenInputField/StripeBankAccountRequiredInput.js +++ b/src/components/StripeBankAccountTokenInputField/StripeBankAccountRequiredInput.js @@ -1,4 +1,5 @@ -import React, { PropTypes } from 'react'; // eslint-disable-line react/no-deprecated +import React from 'react'; +import PropTypes from 'prop-types'; import { FormattedMessage } from 'react-intl'; import classNames from 'classnames'; diff --git a/src/components/StripeBankAccountTokenInputField/StripeBankAccountTokenInputField.js b/src/components/StripeBankAccountTokenInputField/StripeBankAccountTokenInputField.js index 88179d72..5634e30f 100644 --- a/src/components/StripeBankAccountTokenInputField/StripeBankAccountTokenInputField.js +++ b/src/components/StripeBankAccountTokenInputField/StripeBankAccountTokenInputField.js @@ -1,5 +1,6 @@ /* eslint-disable no-underscore-dangle */ -import React, { Component, PropTypes } from 'react'; // eslint-disable-line react/no-deprecated +import React, { Component } from 'react'; +import PropTypes from 'prop-types'; import { intlShape, injectIntl, FormattedMessage } from 'react-intl'; import { Field } from 'redux-form'; import classNames from 'classnames'; diff --git a/src/components/TabNav/TabNav.js b/src/components/TabNav/TabNav.js index 70374b4d..53262f9e 100644 --- a/src/components/TabNav/TabNav.js +++ b/src/components/TabNav/TabNav.js @@ -1,4 +1,5 @@ -import React, { PropTypes } from 'react'; // eslint-disable-line react/no-deprecated +import React from 'react'; +import PropTypes from 'prop-types'; import classNames from 'classnames'; import { NamedLink } from '../../components'; diff --git a/src/components/TabNavHorizontal/TabNavHorizontal.js b/src/components/TabNavHorizontal/TabNavHorizontal.js index 41784b4d..2d95f803 100644 --- a/src/components/TabNavHorizontal/TabNavHorizontal.js +++ b/src/components/TabNavHorizontal/TabNavHorizontal.js @@ -1,4 +1,5 @@ -import React, { PropTypes } from 'react'; // eslint-disable-line react/no-deprecated +import React from 'react'; +import PropTypes from 'prop-types'; import classNames from 'classnames'; import { NamedLink } from '../../components'; diff --git a/src/components/Tabs/Tabs.example.js b/src/components/Tabs/Tabs.example.js index cf15e554..bcf21fad 100644 --- a/src/components/Tabs/Tabs.example.js +++ b/src/components/Tabs/Tabs.example.js @@ -1,4 +1,5 @@ -import React, { PropTypes } from 'react'; // eslint-disable-line react/no-deprecated +import React from 'react'; +import PropTypes from 'prop-types'; import Tabs from './Tabs'; const TestPanel = props => { diff --git a/src/components/Tabs/Tabs.js b/src/components/Tabs/Tabs.js index 5cca2d32..aaf8a1a4 100644 --- a/src/components/Tabs/Tabs.js +++ b/src/components/Tabs/Tabs.js @@ -15,7 +15,8 @@ * */ -import React, { PropTypes } from 'react'; // eslint-disable-line react/no-deprecated +import React from 'react'; +import PropTypes from 'prop-types'; import classNames from 'classnames'; import { TabNav } from '../../components'; diff --git a/src/components/TextInputField/TextInputField.js b/src/components/TextInputField/TextInputField.js index ff173ec8..df923969 100644 --- a/src/components/TextInputField/TextInputField.js +++ b/src/components/TextInputField/TextInputField.js @@ -1,4 +1,5 @@ -import React, { Component, PropTypes } from 'react'; // eslint-disable-line react/no-deprecated +import React, { Component } from 'react'; +import PropTypes from 'prop-types'; import { Field } from 'redux-form'; import classNames from 'classnames'; import { ValidationError, ExpandingTextarea } from '../../components'; diff --git a/src/components/Topbar/LogoIcon.js b/src/components/Topbar/LogoIcon.js index 6e5d6a40..a08e86ab 100644 --- a/src/components/Topbar/LogoIcon.js +++ b/src/components/Topbar/LogoIcon.js @@ -1,4 +1,5 @@ -import React, { PropTypes } from 'react'; // eslint-disable-line react/no-deprecated +import React from 'react'; +import PropTypes from 'prop-types'; const LogoIcon = props => { const { className } = props; diff --git a/src/components/Topbar/MenuIcon.js b/src/components/Topbar/MenuIcon.js index 06bd7b05..d45541e9 100644 --- a/src/components/Topbar/MenuIcon.js +++ b/src/components/Topbar/MenuIcon.js @@ -1,4 +1,5 @@ -import React, { PropTypes } from 'react'; // eslint-disable-line react/no-deprecated +import React from 'react'; +import PropTypes from 'prop-types'; import classNames from 'classnames'; import css from './Topbar.css'; diff --git a/src/components/Topbar/SearchIcon.js b/src/components/Topbar/SearchIcon.js index 6fde019b..ee6c8c0e 100644 --- a/src/components/Topbar/SearchIcon.js +++ b/src/components/Topbar/SearchIcon.js @@ -1,4 +1,5 @@ -import React, { PropTypes } from 'react'; // eslint-disable-line react/no-deprecated +import React from 'react'; +import PropTypes from 'prop-types'; import classNames from 'classnames'; import css from './Topbar.css'; diff --git a/src/components/Topbar/Topbar.js b/src/components/Topbar/Topbar.js index 029c2e92..07b84569 100644 --- a/src/components/Topbar/Topbar.js +++ b/src/components/Topbar/Topbar.js @@ -1,4 +1,5 @@ -import React, { Component, PropTypes } from 'react'; // eslint-disable-line react/no-deprecated +import React, { Component } from 'react'; +import PropTypes from 'prop-types'; import { compose } from 'redux'; import { FormattedMessage, intlShape, injectIntl } from 'react-intl'; import { pickBy } from 'lodash'; diff --git a/src/components/TopbarDesktop/TopbarDesktop.js b/src/components/TopbarDesktop/TopbarDesktop.js index af74e473..3bb9e6ed 100644 --- a/src/components/TopbarDesktop/TopbarDesktop.js +++ b/src/components/TopbarDesktop/TopbarDesktop.js @@ -1,4 +1,5 @@ -import React, { PropTypes } from 'react'; // eslint-disable-line react/no-deprecated +import React from 'react'; +import PropTypes from 'prop-types'; import { FormattedMessage, intlShape } from 'react-intl'; import classNames from 'classnames'; import { ACCOUNT_SETTINGS_PAGES } from '../../routeConfiguration'; diff --git a/src/components/TopbarMobileMenu/TopbarMobileMenu.js b/src/components/TopbarMobileMenu/TopbarMobileMenu.js index 04f721c6..d0c9bbc7 100644 --- a/src/components/TopbarMobileMenu/TopbarMobileMenu.js +++ b/src/components/TopbarMobileMenu/TopbarMobileMenu.js @@ -2,7 +2,8 @@ * TopbarMobileMenu prints the menu content for authenticated user or * shows login actions for those who are not authenticated. */ -import React, { PropTypes } from 'react'; // eslint-disable-line react/no-deprecated +import React from 'react'; +import PropTypes from 'prop-types'; import { FormattedMessage } from 'react-intl'; import classNames from 'classnames'; import { ACCOUNT_SETTINGS_PAGES } from '../../routeConfiguration'; diff --git a/src/components/UserNav/UserNav.js b/src/components/UserNav/UserNav.js index 3577d5e0..bf85da8d 100644 --- a/src/components/UserNav/UserNav.js +++ b/src/components/UserNav/UserNav.js @@ -1,4 +1,5 @@ -import React, { PropTypes } from 'react'; // eslint-disable-line react/no-deprecated +import React from 'react'; +import PropTypes from 'prop-types'; import { FormattedMessage } from 'react-intl'; import classNames from 'classnames'; import { ACCOUNT_SETTINGS_PAGES } from '../../routeConfiguration'; diff --git a/src/components/ValidationError/ValidationError.js b/src/components/ValidationError/ValidationError.js index cef129e1..cfda30b5 100644 --- a/src/components/ValidationError/ValidationError.js +++ b/src/components/ValidationError/ValidationError.js @@ -1,4 +1,5 @@ -import React, { PropTypes } from 'react'; // eslint-disable-line react/no-deprecated +import React from 'react'; +import PropTypes from 'prop-types'; import classNames from 'classnames'; import css from './ValidationError.css'; diff --git a/src/containers/AuthenticationPage/AuthenticationPage.js b/src/containers/AuthenticationPage/AuthenticationPage.js index c0b53759..7d262b1f 100644 --- a/src/containers/AuthenticationPage/AuthenticationPage.js +++ b/src/containers/AuthenticationPage/AuthenticationPage.js @@ -1,4 +1,5 @@ -import React, { PropTypes } from 'react'; // eslint-disable-line react/no-deprecated +import React from 'react'; +import PropTypes from 'prop-types'; import { compose } from 'redux'; import { connect } from 'react-redux'; import { withRouter, Redirect } from 'react-router-dom'; diff --git a/src/containers/BookingDatesForm/BookingDatesForm.js b/src/containers/BookingDatesForm/BookingDatesForm.js index 37cfb6cc..b6786fab 100644 --- a/src/containers/BookingDatesForm/BookingDatesForm.js +++ b/src/containers/BookingDatesForm/BookingDatesForm.js @@ -1,4 +1,5 @@ -import React, { Component, PropTypes } from 'react'; // eslint-disable-line react/no-deprecated +import React, { Component } from 'react'; +import PropTypes from 'prop-types'; import { compose } from 'redux'; import { connect } from 'react-redux'; import { reduxForm, formValueSelector, propTypes as formPropTypes } from 'redux-form'; diff --git a/src/containers/CheckoutPage/CheckoutPage.js b/src/containers/CheckoutPage/CheckoutPage.js index d3d5aed7..be24793e 100644 --- a/src/containers/CheckoutPage/CheckoutPage.js +++ b/src/containers/CheckoutPage/CheckoutPage.js @@ -1,4 +1,5 @@ -import React, { Component, PropTypes } from 'react'; // eslint-disable-line react/no-deprecated +import React, { Component } from 'react'; +import PropTypes from 'prop-types'; import { compose } from 'redux'; import { connect } from 'react-redux'; import { FormattedMessage, injectIntl, intlShape } from 'react-intl'; diff --git a/src/containers/CheckoutPage/LogoIcon.js b/src/containers/CheckoutPage/LogoIcon.js index 0196328f..15424b7a 100644 --- a/src/containers/CheckoutPage/LogoIcon.js +++ b/src/containers/CheckoutPage/LogoIcon.js @@ -1,4 +1,5 @@ -import React, { PropTypes } from 'react'; // eslint-disable-line react/no-deprecated +import React from 'react'; +import PropTypes from 'prop-types'; import desktopLogo from './images/saunatime-logo.png'; const LogoIcon = props => { diff --git a/src/containers/ContactDetailsForm/ContactDetailsForm.js b/src/containers/ContactDetailsForm/ContactDetailsForm.js index 72397dcd..d4a30b4c 100644 --- a/src/containers/ContactDetailsForm/ContactDetailsForm.js +++ b/src/containers/ContactDetailsForm/ContactDetailsForm.js @@ -1,4 +1,5 @@ -import React, { Component, PropTypes } from 'react'; // eslint-disable-line react/no-deprecated +import React, { Component } from 'react'; +import PropTypes from 'prop-types'; import { compose } from 'redux'; import { FormattedMessage, injectIntl, intlShape } from 'react-intl'; import { reduxForm, propTypes as formPropTypes } from 'redux-form'; diff --git a/src/containers/ContactDetailsPage/ContactDetailsPage.js b/src/containers/ContactDetailsPage/ContactDetailsPage.js index 2b1270e4..d529d89d 100644 --- a/src/containers/ContactDetailsPage/ContactDetailsPage.js +++ b/src/containers/ContactDetailsPage/ContactDetailsPage.js @@ -1,4 +1,5 @@ -import React, { PropTypes } from 'react'; // eslint-disable-line react/no-deprecated +import React from 'react'; +import PropTypes from 'prop-types'; import { compose } from 'redux'; import { connect } from 'react-redux'; import { FormattedMessage } from 'react-intl'; diff --git a/src/containers/EditListingDescriptionForm/EditListingDescriptionForm.js b/src/containers/EditListingDescriptionForm/EditListingDescriptionForm.js index 0779743f..fd8909d0 100644 --- a/src/containers/EditListingDescriptionForm/EditListingDescriptionForm.js +++ b/src/containers/EditListingDescriptionForm/EditListingDescriptionForm.js @@ -1,4 +1,5 @@ -import React, { PropTypes } from 'react'; // eslint-disable-line react/no-deprecated +import React from 'react'; +import PropTypes from 'prop-types'; import { compose } from 'redux'; import { reduxForm, propTypes as formPropTypes } from 'redux-form'; import { intlShape, injectIntl, FormattedMessage } from 'react-intl'; diff --git a/src/containers/EditListingLocationForm/EditListingLocationForm.js b/src/containers/EditListingLocationForm/EditListingLocationForm.js index 425263aa..e2c8c853 100644 --- a/src/containers/EditListingLocationForm/EditListingLocationForm.js +++ b/src/containers/EditListingLocationForm/EditListingLocationForm.js @@ -1,4 +1,5 @@ -import React, { PropTypes } from 'react'; // eslint-disable-line react/no-deprecated +import React from 'react'; +import PropTypes from 'prop-types'; import { compose } from 'redux'; import { connect } from 'react-redux'; import { reduxForm, formValueSelector, propTypes as formPropTypes } from 'redux-form'; diff --git a/src/containers/EditListingPage/EditListingPage.js b/src/containers/EditListingPage/EditListingPage.js index 52059f61..d98e11c4 100644 --- a/src/containers/EditListingPage/EditListingPage.js +++ b/src/containers/EditListingPage/EditListingPage.js @@ -1,4 +1,5 @@ -import React, { PropTypes } from 'react'; // eslint-disable-line react/no-deprecated +import React from 'react'; +import PropTypes from 'prop-types'; import { compose } from 'redux'; import { withRouter } from 'react-router-dom'; import { intlShape, injectIntl } from 'react-intl'; @@ -180,7 +181,7 @@ const { bool, func, instanceOf, object, shape, string, oneOf } = PropTypes; EditListingPageComponent.propTypes = { authInfoError: instanceOf(Error), - createStripeAccountError: PropTypes.instanceOf(Error), + createStripeAccountError: instanceOf(Error), currentUser: propTypes.currentUser, fetchInProgress: bool.isRequired, getListing: func.isRequired, diff --git a/src/containers/EditListingPhotosForm/EditListingPhotosForm.js b/src/containers/EditListingPhotosForm/EditListingPhotosForm.js index afbfdd8f..edb1522f 100644 --- a/src/containers/EditListingPhotosForm/EditListingPhotosForm.js +++ b/src/containers/EditListingPhotosForm/EditListingPhotosForm.js @@ -1,4 +1,5 @@ -import React, { Component, PropTypes } from 'react'; // eslint-disable-line react/no-deprecated +import React, { Component } from 'react'; +import PropTypes from 'prop-types'; import { compose } from 'redux'; import { Field, reduxForm, propTypes as formPropTypes } from 'redux-form'; import { FormattedMessage, intlShape, injectIntl } from 'react-intl'; diff --git a/src/containers/EditListingPricingForm/EditListingPricingForm.js b/src/containers/EditListingPricingForm/EditListingPricingForm.js index 4ade5caf..c29b6b5e 100644 --- a/src/containers/EditListingPricingForm/EditListingPricingForm.js +++ b/src/containers/EditListingPricingForm/EditListingPricingForm.js @@ -1,4 +1,5 @@ -import React, { PropTypes } from 'react'; // eslint-disable-line react/no-deprecated +import React from 'react'; +import PropTypes from 'prop-types'; import { compose } from 'redux'; import { reduxForm, propTypes as formPropTypes } from 'redux-form'; import { intlShape, injectIntl, FormattedMessage } from 'react-intl'; diff --git a/src/containers/EmailVerificationForm/EmailVerificationForm.js b/src/containers/EmailVerificationForm/EmailVerificationForm.js index 95f61112..b46bc818 100644 --- a/src/containers/EmailVerificationForm/EmailVerificationForm.js +++ b/src/containers/EmailVerificationForm/EmailVerificationForm.js @@ -1,4 +1,5 @@ -import React, { PropTypes } from 'react'; // eslint-disable-line react/no-deprecated +import React from 'react'; +import PropTypes from 'prop-types'; import { compose } from 'redux'; import { FormattedMessage, injectIntl } from 'react-intl'; import { reduxForm, Field, propTypes as formPropTypes } from 'redux-form'; diff --git a/src/containers/EmailVerificationPage/EmailVerificationPage.js b/src/containers/EmailVerificationPage/EmailVerificationPage.js index 779d9aec..90490929 100644 --- a/src/containers/EmailVerificationPage/EmailVerificationPage.js +++ b/src/containers/EmailVerificationPage/EmailVerificationPage.js @@ -1,4 +1,5 @@ -import React, { PropTypes } from 'react'; // eslint-disable-line react/no-deprecated +import React from 'react'; +import PropTypes from 'prop-types'; import { compose } from 'redux'; import { connect } from 'react-redux'; import { withRouter } from 'react-router-dom'; diff --git a/src/containers/InboxPage/InboxPage.js b/src/containers/InboxPage/InboxPage.js index e1dce82c..93da1416 100644 --- a/src/containers/InboxPage/InboxPage.js +++ b/src/containers/InboxPage/InboxPage.js @@ -1,4 +1,5 @@ -import React, { PropTypes } from 'react'; // eslint-disable-line react/no-deprecated +import React from 'react'; +import PropTypes from 'prop-types'; import { compose } from 'redux'; import { connect } from 'react-redux'; import { FormattedMessage, injectIntl, intlShape } from 'react-intl'; diff --git a/src/containers/LandingPage/LandingPage.js b/src/containers/LandingPage/LandingPage.js index 3ef49f27..7c08ac99 100644 --- a/src/containers/LandingPage/LandingPage.js +++ b/src/containers/LandingPage/LandingPage.js @@ -1,4 +1,5 @@ -import React, { PropTypes } from 'react'; // eslint-disable-line react/no-deprecated +import React from 'react'; +import PropTypes from 'prop-types'; import { compose } from 'redux'; import { connect } from 'react-redux'; import { withRouter } from 'react-router-dom'; diff --git a/src/containers/ListingPage/EditIcon.js b/src/containers/ListingPage/EditIcon.js index 51bce939..7ab76c10 100644 --- a/src/containers/ListingPage/EditIcon.js +++ b/src/containers/ListingPage/EditIcon.js @@ -1,4 +1,5 @@ -import React, { PropTypes } from 'react'; // eslint-disable-line react/no-deprecated +import React from 'react'; +import PropTypes from 'prop-types'; const EditIcon = props => { const { className } = props; diff --git a/src/containers/ListingPage/ListingPage.js b/src/containers/ListingPage/ListingPage.js index 34bcd1e4..ecb8027a 100644 --- a/src/containers/ListingPage/ListingPage.js +++ b/src/containers/ListingPage/ListingPage.js @@ -1,5 +1,6 @@ /* eslint-disable jsx-a11y/no-static-element-interactions */ -import React, { Component, PropTypes } from 'react'; // eslint-disable-line react/no-deprecated +import React, { Component } from 'react'; +import PropTypes from 'prop-types'; import { FormattedMessage, intlShape, injectIntl } from 'react-intl'; import { compose } from 'redux'; import { connect } from 'react-redux'; diff --git a/src/containers/LocationSearchForm/LocationSearchForm.js b/src/containers/LocationSearchForm/LocationSearchForm.js index 7531cd74..b7031685 100644 --- a/src/containers/LocationSearchForm/LocationSearchForm.js +++ b/src/containers/LocationSearchForm/LocationSearchForm.js @@ -1,4 +1,5 @@ -import React, { PropTypes } from 'react'; // eslint-disable-line react/no-deprecated +import React from 'react'; +import PropTypes from 'prop-types'; import { compose } from 'redux'; import { Field, reduxForm, propTypes as formPropTypes } from 'redux-form'; import { intlShape, injectIntl } from 'react-intl'; diff --git a/src/containers/LoginForm/LoginForm.js b/src/containers/LoginForm/LoginForm.js index 1f38115a..33a17cb6 100644 --- a/src/containers/LoginForm/LoginForm.js +++ b/src/containers/LoginForm/LoginForm.js @@ -1,4 +1,5 @@ -import React, { PropTypes } from 'react'; // eslint-disable-line react/no-deprecated +import React from 'react'; +import PropTypes from 'prop-types'; import { compose } from 'redux'; import { FormattedMessage, injectIntl, intlShape } from 'react-intl'; import { reduxForm, propTypes as formPropTypes } from 'redux-form'; diff --git a/src/containers/ManageListingsPage/ManageListingsPage.js b/src/containers/ManageListingsPage/ManageListingsPage.js index cf28a4f7..4861a5fb 100644 --- a/src/containers/ManageListingsPage/ManageListingsPage.js +++ b/src/containers/ManageListingsPage/ManageListingsPage.js @@ -1,4 +1,5 @@ -import React, { Component, PropTypes } from 'react'; // eslint-disable-line react/no-deprecated +import React, { Component } from 'react'; +import PropTypes from 'prop-types'; import { compose } from 'redux'; import { connect } from 'react-redux'; import { FormattedMessage } from 'react-intl'; diff --git a/src/containers/NotFoundPage/NotFoundPage.js b/src/containers/NotFoundPage/NotFoundPage.js index 2d124c63..e30b6824 100644 --- a/src/containers/NotFoundPage/NotFoundPage.js +++ b/src/containers/NotFoundPage/NotFoundPage.js @@ -1,4 +1,5 @@ -import React, { Component, PropTypes } from 'react'; // eslint-disable-line react/no-deprecated +import React, { Component } from 'react'; +import PropTypes from 'prop-types'; import { injectIntl, intlShape, FormattedMessage } from 'react-intl'; import { compose } from 'redux'; import { connect } from 'react-redux'; diff --git a/src/containers/OrderPage/OrderPage.js b/src/containers/OrderPage/OrderPage.js index f3575886..22c55c91 100644 --- a/src/containers/OrderPage/OrderPage.js +++ b/src/containers/OrderPage/OrderPage.js @@ -1,4 +1,5 @@ -import React, { PropTypes } from 'react'; // eslint-disable-line react/no-deprecated +import React from 'react'; +import PropTypes from 'prop-types'; import { compose } from 'redux'; import { connect } from 'react-redux'; import classNames from 'classnames'; diff --git a/src/containers/PasswordChangeForm/PasswordChangeForm.js b/src/containers/PasswordChangeForm/PasswordChangeForm.js index 6547ff08..27508c43 100644 --- a/src/containers/PasswordChangeForm/PasswordChangeForm.js +++ b/src/containers/PasswordChangeForm/PasswordChangeForm.js @@ -1,4 +1,5 @@ -import React, { Component, PropTypes } from 'react'; // eslint-disable-line react/no-deprecated +import React, { Component } from 'react'; +import PropTypes from 'prop-types'; import { compose } from 'redux'; import { FormattedMessage, injectIntl, intlShape } from 'react-intl'; import { reduxForm, propTypes as formPropTypes } from 'redux-form'; diff --git a/src/containers/PasswordChangePage/PasswordChangePage.js b/src/containers/PasswordChangePage/PasswordChangePage.js index 4a2f7ae1..e17bcf7b 100644 --- a/src/containers/PasswordChangePage/PasswordChangePage.js +++ b/src/containers/PasswordChangePage/PasswordChangePage.js @@ -1,4 +1,5 @@ -import React, { PropTypes } from 'react'; // eslint-disable-line react/no-deprecated +import React from 'react'; +import PropTypes from 'prop-types'; import { compose } from 'redux'; import { connect } from 'react-redux'; import { FormattedMessage } from 'react-intl'; diff --git a/src/containers/PasswordRecoveryForm/PasswordRecoveryForm.js b/src/containers/PasswordRecoveryForm/PasswordRecoveryForm.js index 2879da21..5ddf917b 100644 --- a/src/containers/PasswordRecoveryForm/PasswordRecoveryForm.js +++ b/src/containers/PasswordRecoveryForm/PasswordRecoveryForm.js @@ -1,4 +1,5 @@ -import React, { PropTypes } from 'react'; // eslint-disable-line react/no-deprecated +import React from 'react'; +import PropTypes from 'prop-types'; import { compose } from 'redux'; import { FormattedMessage, injectIntl, intlShape } from 'react-intl'; import { reduxForm, propTypes as formPropTypes } from 'redux-form'; diff --git a/src/containers/PasswordRecoveryPage/DoorIcon.js b/src/containers/PasswordRecoveryPage/DoorIcon.js index bff2c178..6281f9de 100644 --- a/src/containers/PasswordRecoveryPage/DoorIcon.js +++ b/src/containers/PasswordRecoveryPage/DoorIcon.js @@ -1,4 +1,5 @@ -import React, { PropTypes } from 'react'; // eslint-disable-line react/no-deprecated +import React from 'react'; +import PropTypes from 'prop-types'; const DoorIcon = props => { const { className } = props; diff --git a/src/containers/PasswordRecoveryPage/PasswordRecoveryPage.js b/src/containers/PasswordRecoveryPage/PasswordRecoveryPage.js index afc2e6f0..363c4d88 100644 --- a/src/containers/PasswordRecoveryPage/PasswordRecoveryPage.js +++ b/src/containers/PasswordRecoveryPage/PasswordRecoveryPage.js @@ -1,4 +1,5 @@ -import React, { PropTypes } from 'react'; // eslint-disable-line react/no-deprecated +import React from 'react'; +import PropTypes from 'prop-types'; import { compose } from 'redux'; import { connect } from 'react-redux'; import { FormattedMessage, injectIntl, intlShape } from 'react-intl'; diff --git a/src/containers/PasswordResetForm/PasswordResetForm.js b/src/containers/PasswordResetForm/PasswordResetForm.js index d9b800e5..664e7fab 100644 --- a/src/containers/PasswordResetForm/PasswordResetForm.js +++ b/src/containers/PasswordResetForm/PasswordResetForm.js @@ -1,4 +1,5 @@ -import React, { PropTypes } from 'react'; // eslint-disable-line react/no-deprecated +import React from 'react'; +import PropTypes from 'prop-types'; import { compose } from 'redux'; import { FormattedMessage, injectIntl, intlShape } from 'react-intl'; import { reduxForm, propTypes as formPropTypes } from 'redux-form'; diff --git a/src/containers/PasswordResetPage/PasswordResetPage.js b/src/containers/PasswordResetPage/PasswordResetPage.js index c65981a3..586c0c61 100644 --- a/src/containers/PasswordResetPage/PasswordResetPage.js +++ b/src/containers/PasswordResetPage/PasswordResetPage.js @@ -1,4 +1,5 @@ -import React, { PropTypes, Component } from 'react'; // eslint-disable-line react/no-deprecated +import React, { Component } from 'react'; +import PropTypes from 'prop-types'; import { compose } from 'redux'; import { connect } from 'react-redux'; import { withRouter } from 'react-router-dom'; diff --git a/src/containers/PayoutDetailsForm/PayoutDetailsForm.js b/src/containers/PayoutDetailsForm/PayoutDetailsForm.js index da0912b3..a10e6509 100644 --- a/src/containers/PayoutDetailsForm/PayoutDetailsForm.js +++ b/src/containers/PayoutDetailsForm/PayoutDetailsForm.js @@ -1,4 +1,5 @@ -import React, { PropTypes } from 'react'; // eslint-disable-line react/no-deprecated +import React from 'react'; +import PropTypes from 'prop-types'; import { compose } from 'redux'; import { connect } from 'react-redux'; import { FormattedMessage, injectIntl, intlShape } from 'react-intl'; diff --git a/src/containers/PayoutPreferencesPage/PayoutPreferencesPage.js b/src/containers/PayoutPreferencesPage/PayoutPreferencesPage.js index c42f0627..43e7a8e2 100644 --- a/src/containers/PayoutPreferencesPage/PayoutPreferencesPage.js +++ b/src/containers/PayoutPreferencesPage/PayoutPreferencesPage.js @@ -1,4 +1,5 @@ -import React, { PropTypes } from 'react'; // eslint-disable-line react/no-deprecated +import React from 'react'; +import PropTypes from 'prop-types'; import { compose } from 'redux'; import { connect } from 'react-redux'; import { isScrollingDisabled } from '../../ducks/UI.duck'; diff --git a/src/containers/ProfilePage/ProfilePage.js b/src/containers/ProfilePage/ProfilePage.js index 51d51bab..2b669d51 100644 --- a/src/containers/ProfilePage/ProfilePage.js +++ b/src/containers/ProfilePage/ProfilePage.js @@ -1,4 +1,5 @@ -import React, { PropTypes } from 'react'; // eslint-disable-line react/no-deprecated +import React from 'react'; +import PropTypes from 'prop-types'; import { compose } from 'redux'; import { connect } from 'react-redux'; import { isScrollingDisabled } from '../../ducks/UI.duck'; diff --git a/src/containers/ProfileSettingsForm/ProfileSettingsForm.js b/src/containers/ProfileSettingsForm/ProfileSettingsForm.js index 96d0b9ae..1a71260f 100644 --- a/src/containers/ProfileSettingsForm/ProfileSettingsForm.js +++ b/src/containers/ProfileSettingsForm/ProfileSettingsForm.js @@ -1,4 +1,5 @@ -import React, { Component, PropTypes } from 'react'; // eslint-disable-line react/no-deprecated +import React, { Component } from 'react'; +import PropTypes from 'prop-types'; import { compose } from 'redux'; import { FormattedMessage, injectIntl, intlShape } from 'react-intl'; import { Field, reduxForm, propTypes as formPropTypes } from 'redux-form'; diff --git a/src/containers/ProfileSettingsPage/ProfileSettingsPage.js b/src/containers/ProfileSettingsPage/ProfileSettingsPage.js index ec587137..89b9a69f 100644 --- a/src/containers/ProfileSettingsPage/ProfileSettingsPage.js +++ b/src/containers/ProfileSettingsPage/ProfileSettingsPage.js @@ -1,4 +1,5 @@ -import React, { PropTypes, Component } from 'react'; // eslint-disable-line react/no-deprecated +import React, { Component } from 'react'; +import PropTypes from 'prop-types'; import { compose } from 'redux'; import { connect } from 'react-redux'; import { FormattedMessage } from 'react-intl'; diff --git a/src/containers/SalePage/SalePage.js b/src/containers/SalePage/SalePage.js index ca9f2b8c..250d8f46 100644 --- a/src/containers/SalePage/SalePage.js +++ b/src/containers/SalePage/SalePage.js @@ -1,4 +1,5 @@ -import React, { PropTypes } from 'react'; // eslint-disable-line react/no-deprecated +import React from 'react'; +import PropTypes from 'prop-types'; import { compose } from 'redux'; import { connect } from 'react-redux'; import classNames from 'classnames'; diff --git a/src/containers/SearchPage/SearchPage.js b/src/containers/SearchPage/SearchPage.js index f2833c8e..157c44bb 100644 --- a/src/containers/SearchPage/SearchPage.js +++ b/src/containers/SearchPage/SearchPage.js @@ -1,4 +1,5 @@ -import React, { Component, PropTypes } from 'react'; // eslint-disable-line react/no-deprecated +import React, { Component } from 'react'; +import PropTypes from 'prop-types'; import { FormattedMessage, injectIntl, intlShape } from 'react-intl'; import { connect } from 'react-redux'; import { compose } from 'redux'; diff --git a/src/containers/SecurityPage/SecurityPage.js b/src/containers/SecurityPage/SecurityPage.js index 36041785..d32b02d2 100644 --- a/src/containers/SecurityPage/SecurityPage.js +++ b/src/containers/SecurityPage/SecurityPage.js @@ -1,4 +1,5 @@ -import React, { PropTypes } from 'react'; // eslint-disable-line react/no-deprecated +import React from 'react'; +import PropTypes from 'prop-types'; import { compose } from 'redux'; import { connect } from 'react-redux'; import { isScrollingDisabled } from '../../ducks/UI.duck'; diff --git a/src/containers/SignupForm/SignupForm.js b/src/containers/SignupForm/SignupForm.js index 9901aed6..4d1fbb07 100644 --- a/src/containers/SignupForm/SignupForm.js +++ b/src/containers/SignupForm/SignupForm.js @@ -1,4 +1,5 @@ -import React, { PropTypes } from 'react'; // eslint-disable-line react/no-deprecated +import React from 'react'; +import PropTypes from 'prop-types'; import { compose } from 'redux'; import { FormattedMessage, injectIntl, intlShape } from 'react-intl'; import { reduxForm, propTypes as formPropTypes } from 'redux-form'; diff --git a/src/containers/StripePaymentForm/StripePaymentForm.js b/src/containers/StripePaymentForm/StripePaymentForm.js index d7f6b7ea..06f8a88d 100644 --- a/src/containers/StripePaymentForm/StripePaymentForm.js +++ b/src/containers/StripePaymentForm/StripePaymentForm.js @@ -1,4 +1,5 @@ -import React, { Component, PropTypes } from 'react'; // eslint-disable-line react/no-deprecated +import React, { Component } from 'react'; +import PropTypes from 'prop-types'; import { FormattedMessage, injectIntl, intlShape } from 'react-intl'; import classNames from 'classnames'; import { Form, PrimaryButton } from '../../components'; diff --git a/src/containers/StyleguidePage/Colors.example.js b/src/containers/StyleguidePage/Colors.example.js index f24fb485..9caf233a 100644 --- a/src/containers/StyleguidePage/Colors.example.js +++ b/src/containers/StyleguidePage/Colors.example.js @@ -1,4 +1,5 @@ -import React, { PropTypes } from 'react'; // eslint-disable-line react/no-deprecated +import React from 'react'; +import PropTypes from 'prop-types'; import css from './StyleguidePage.css'; const ColorCard = props => { diff --git a/src/containers/StyleguidePage/StyleguidePage.js b/src/containers/StyleguidePage/StyleguidePage.js index e8d04ad3..b5c7ab72 100644 --- a/src/containers/StyleguidePage/StyleguidePage.js +++ b/src/containers/StyleguidePage/StyleguidePage.js @@ -1,4 +1,5 @@ -import React, { PropTypes } from 'react'; // eslint-disable-line react/no-deprecated +import React from 'react'; +import PropTypes from 'prop-types'; import { isEmpty } from 'lodash'; import classNames from 'classnames'; import { NamedLink } from '../../components'; diff --git a/src/containers/StyleguidePage/Typography.example.js b/src/containers/StyleguidePage/Typography.example.js index 0210760c..0ae31e88 100644 --- a/src/containers/StyleguidePage/Typography.example.js +++ b/src/containers/StyleguidePage/Typography.example.js @@ -1,4 +1,5 @@ -import React, { PropTypes } from 'react'; // eslint-disable-line react/no-deprecated +import React from 'react'; +import PropTypes from 'prop-types'; import classNames from 'classnames'; import css from './StyleguidePage.css'; diff --git a/src/containers/TopbarContainer/TopbarContainer.js b/src/containers/TopbarContainer/TopbarContainer.js index c916104b..033f6370 100644 --- a/src/containers/TopbarContainer/TopbarContainer.js +++ b/src/containers/TopbarContainer/TopbarContainer.js @@ -1,4 +1,5 @@ -import React, { PropTypes } from 'react'; // eslint-disable-line react/no-deprecated +import React from 'react'; +import PropTypes from 'prop-types'; import { compose } from 'redux'; import { connect } from 'react-redux'; import { withRouter } from 'react-router-dom'; diff --git a/src/containers/TopbarSearchForm/TopbarSearchForm.js b/src/containers/TopbarSearchForm/TopbarSearchForm.js index c6fb593b..2127ff82 100644 --- a/src/containers/TopbarSearchForm/TopbarSearchForm.js +++ b/src/containers/TopbarSearchForm/TopbarSearchForm.js @@ -1,4 +1,5 @@ -import React, { Component, PropTypes } from 'react'; // eslint-disable-line react/no-deprecated +import React, { Component } from 'react'; +import PropTypes from 'prop-types'; import { compose } from 'redux'; import { Field, reduxForm, propTypes as formPropTypes } from 'redux-form'; import { intlShape, injectIntl } from 'react-intl'; diff --git a/src/util/contextHelpers.js b/src/util/contextHelpers.js index 09e51325..0f3ebd60 100644 --- a/src/util/contextHelpers.js +++ b/src/util/contextHelpers.js @@ -1,4 +1,5 @@ -import React, { PropTypes, Component as ReactComponent } from 'react'; // eslint-disable-line react/no-deprecated +import React, { Component as ReactComponent } from 'react'; +import PropTypes from 'prop-types'; import { throttle } from 'lodash'; /** diff --git a/src/util/forms.js b/src/util/forms.js index e63ff169..5d1e1330 100644 --- a/src/util/forms.js +++ b/src/util/forms.js @@ -1,4 +1,5 @@ -import React, { Component, PropTypes } from 'react'; // eslint-disable-line react/no-deprecated +import React, { Component } from 'react'; +import PropTypes from 'prop-types'; import { ValidationError } from '../components'; /** diff --git a/src/util/propTypes.js b/src/util/propTypes.js index a68e26c2..f9533acd 100644 --- a/src/util/propTypes.js +++ b/src/util/propTypes.js @@ -17,7 +17,7 @@ * defined. This way we get the validation errors only in the most * specific place and avoid duplicate errros. */ -import { PropTypes } from 'react'; // eslint-disable-line react/no-deprecated +import PropTypes from 'prop-types'; import Decimal from 'decimal.js'; import { types as sdkTypes } from './sdkLoader'; import { ensureTransaction } from './data'; diff --git a/src/util/routes.test.js b/src/util/routes.test.js index e316bd24..58a46d95 100644 --- a/src/util/routes.test.js +++ b/src/util/routes.test.js @@ -1,4 +1,5 @@ -import React, { PropTypes } from 'react'; // eslint-disable-line react/no-deprecated +import React from 'react'; +import PropTypes from 'prop-types'; import { RoutesProvider } from '../components'; import routeConfiguration from '../routeConfiguration'; import { renderDeep, renderShallow } from './test-helpers';