Added webpack.ProvidePlugin for most used imports

Removed imports of React, connect, PropTypes throughout
Removed the "React" in React.Component/PureComponent

app/javascript/gabsocial/components/__tests__/autosuggest_emoji-test.js

@@ -1,4 +1,3 @@
-import React from 'react';
 import renderer from 'react-test-renderer';
 import AutosuggestEmoji from '../autosuggest_emoji';
 

app/javascript/gabsocial/components/__tests__/avatar-test.js

@@ -1,4 +1,3 @@
-import React from 'react';
 import renderer from 'react-test-renderer';
 import { fromJS } from 'immutable';
 import Avatar from '../avatar';

app/javascript/gabsocial/components/__tests__/avatar_overlay-test.js

@@ -1,4 +1,3 @@
-import React from 'react';
 import renderer from 'react-test-renderer';
 import { fromJS } from 'immutable';
 import AvatarOverlay from '../avatar_overlay';

app/javascript/gabsocial/components/__tests__/button-test.js

@@ -1,5 +1,4 @@
 import { shallow } from 'enzyme';
-import React from 'react';
 import renderer from 'react-test-renderer';
 import Button from '../button';
 

app/javascript/gabsocial/components/__tests__/display_name-test.js

@@ -1,4 +1,3 @@
-import React from 'react';
 import renderer from 'react-test-renderer';
 import { fromJS }  from 'immutable';
 import DisplayName from '../display_name';

app/javascript/gabsocial/components/account.js

@@ -1,6 +1,5 @@
 import React, { Fragment } from 'react';
 import ImmutablePropTypes from 'react-immutable-proptypes';
-import PropTypes from 'prop-types';
 import Avatar from './avatar';
 import DisplayName from './display_name';
 import Permalink from './permalink';

app/javascript/gabsocial/components/attachment_list.js

@@ -1,6 +1,4 @@
-import React from 'react';
 import ImmutablePropTypes from 'react-immutable-proptypes';
-import PropTypes from 'prop-types';
 import ImmutablePureComponent from 'react-immutable-pure-component';
 import Icon from 'gabsocial/components/icon';
 

app/javascript/gabsocial/components/autosuggest_emoji.js

@@ -1,10 +1,8 @@
-import React from 'react';
-import PropTypes from 'prop-types';
 import unicodeMapping from '../features/emoji/emoji_unicode_mapping_light';
 
 const assetHost = process.env.CDN_HOST || '';
 
-export default class AutosuggestEmoji extends React.PureComponent {
+export default class AutosuggestEmoji extends PureComponent {
 
   static propTypes = {
     emoji: PropTypes.object.isRequired,

app/javascript/gabsocial/components/autosuggest_input.js

@@ -1,8 +1,6 @@
-import React from 'react';
 import AutosuggestAccountContainer from '../features/compose/containers/autosuggest_account_container';
 import AutosuggestEmoji from './autosuggest_emoji';
 import ImmutablePropTypes from 'react-immutable-proptypes';
-import PropTypes from 'prop-types';
 import { isRtl } from '../utils/rtl';
 import ImmutablePureComponent from 'react-immutable-pure-component';
 import classNames from 'classnames';

app/javascript/gabsocial/components/autosuggest_textarea.js

@@ -1,8 +1,6 @@
-import React from 'react';
 import AutosuggestAccountContainer from '../features/compose/containers/autosuggest_account_container';
 import AutosuggestEmoji from './autosuggest_emoji';
 import ImmutablePropTypes from 'react-immutable-proptypes';
-import PropTypes from 'prop-types';
 import { isRtl } from '../utils/rtl';
 import ImmutablePureComponent from 'react-immutable-pure-component';
 import Textarea from 'react-textarea-autosize';

app/javascript/gabsocial/components/avatar.js

@@ -1,5 +1,3 @@
-import React from 'react';
-import PropTypes from 'prop-types';
 import ImmutablePropTypes from 'react-immutable-proptypes';
 import { autoPlayGif } from '../initial_state';
 

app/javascript/gabsocial/components/button.js

@@ -1,8 +1,6 @@
-import React from 'react';
-import PropTypes from 'prop-types';
 import classNames from 'classnames';
 
-export default class Button extends React.PureComponent {
+export default class Button extends PureComponent {
 
   static propTypes = {
     text: PropTypes.node,

app/javascript/gabsocial/components/column.js

@@ -1,7 +1,5 @@
-import React from 'react';
-import PropTypes from 'prop-types';
 
-export default class Column extends React.PureComponent {
+export default class Column extends PureComponent {
 
   static propTypes = {
     children: PropTypes.node,

app/javascript/gabsocial/components/column_back_button.js

@@ -1,9 +1,7 @@
-import React from 'react';
 import { FormattedMessage } from 'react-intl';
-import PropTypes from 'prop-types';
 import Icon from 'gabsocial/components/icon';
 
-export default class ColumnBackButton extends React.PureComponent {
+export default class ColumnBackButton extends PureComponent {
 
   static contextTypes = {
     router: PropTypes.object,

app/javascript/gabsocial/components/column_back_button_slim.js

@@ -1,4 +1,3 @@
-import React from 'react';
 import { FormattedMessage } from 'react-intl';
 import ColumnBackButton from './column_back_button';
 import Icon from 'gabsocial/components/icon';

app/javascript/gabsocial/components/column_header.js

@@ -1,7 +1,5 @@
 'use strict';
 
-import React from 'react';
-import PropTypes from 'prop-types';
 import classNames from 'classnames';
 import { FormattedMessage, injectIntl, defineMessages } from 'react-intl';
 import Icon from 'gabsocial/components/icon';
@@ -12,7 +10,7 @@ const messages = defineMessages({
 });
 
 export default @injectIntl
-class ColumnHeader extends React.PureComponent {
+class ColumnHeader extends PureComponent {
 
   static contextTypes = {
     router: PropTypes.object,

app/javascript/gabsocial/components/display_name.js

@@ -1,6 +1,4 @@
-import React from 'react';
 import ImmutablePropTypes from 'react-immutable-proptypes';
-import PropTypes from 'prop-types';
 import VerificationBadge from './verification_badge';
 
 export default class DisplayName extends React.PureComponent {

app/javascript/gabsocial/components/domain.js

@@ -1,5 +1,3 @@
-import React from 'react';
-import PropTypes from 'prop-types';
 import IconButton from './icon_button';
 import { defineMessages, injectIntl } from 'react-intl';
 import ImmutablePureComponent from 'react-immutable-pure-component';

app/javascript/gabsocial/components/donor_badge.js

@@ -1,4 +1,3 @@
-import React from 'react';
 
 const DonorBadge = () => (
   <span className='badge badge--donor'>Donor</span>

app/javascript/gabsocial/components/dropdown_menu.js

@@ -1,5 +1,3 @@
-import React from 'react';
-import PropTypes from 'prop-types';
 import ImmutablePropTypes from 'react-immutable-proptypes';
 import IconButton from './icon_button';
 import Overlay from 'react-overlays/lib/Overlay';
@@ -10,7 +8,7 @@ import detectPassiveEvents from 'detect-passive-events';
 const listenerOptions = detectPassiveEvents.hasSupport ? { passive: true } : false;
 let id = 0;
 
-class DropdownMenu extends React.PureComponent {
+class DropdownMenu extends PureComponent {
 
   static contextTypes = {
     router: PropTypes.object,
@@ -164,7 +162,7 @@ class DropdownMenu extends React.PureComponent {
 
 }
 
-export default class Dropdown extends React.PureComponent {
+export default class Dropdown extends PureComponent {
 
   static contextTypes = {
     router: PropTypes.object,

app/javascript/gabsocial/components/error_boundary.js

@@ -1,8 +1,6 @@
-import React from 'react';
-import PropTypes from 'prop-types';
 import { FormattedMessage } from 'react-intl';
 
-export default class ErrorBoundary extends React.PureComponent {
+export default class ErrorBoundary extends PureComponent {
 
   static propTypes = {
     children: PropTypes.node,

app/javascript/gabsocial/components/extended_video_player.js

@@ -1,7 +1,5 @@
-import React from 'react';
-import PropTypes from 'prop-types';
 
-export default class ExtendedVideoPlayer extends React.PureComponent {
+export default class ExtendedVideoPlayer extends PureComponent {
 
   static propTypes = {
     src: PropTypes.string.isRequired,

app/javascript/gabsocial/components/hashtag.js

@@ -1,4 +1,3 @@
-import React from 'react';
 import { Sparklines, SparklinesCurve } from 'react-sparklines';
 import { FormattedMessage } from 'react-intl';
 import ImmutablePropTypes from 'react-immutable-proptypes';

app/javascript/gabsocial/components/home_column_header.js

@@ -1,8 +1,5 @@
 'use strict';
 
-import React from 'react';
-import { connect } from 'react-redux';
-import PropTypes from 'prop-types';
 import ImmutablePropTypes from 'react-immutable-proptypes';
 import classNames from 'classnames';
 import { FormattedMessage, injectIntl, defineMessages } from 'react-intl';
@@ -34,7 +31,7 @@ const mapStateToProps = state => {
   };
 };
 
-class ColumnHeader extends React.PureComponent {
+class ColumnHeader extends PureComponent {
 
   static contextTypes = {
     router: PropTypes.object,

app/javascript/gabsocial/components/icon.js

@@ -1,8 +1,6 @@
-import React from 'react';
-import PropTypes from 'prop-types';
 import classNames from 'classnames';
 
-export default class Icon extends React.PureComponent {
+export default class Icon extends PureComponent {
 
   static propTypes = {
     id: PropTypes.string.isRequired,

app/javascript/gabsocial/components/icon_button.js

@@ -1,11 +1,9 @@
-import React from 'react';
 import Motion from '../features/ui/util/optional_motion';
 import spring from 'react-motion/lib/spring';
-import PropTypes from 'prop-types';
 import classNames from 'classnames';
 import Icon from 'gabsocial/components/icon';
 
-export default class IconButton extends React.PureComponent {
+export default class IconButton extends PureComponent {
 
   static propTypes = {
     className: PropTypes.string,

app/javascript/gabsocial/components/icon_with_badge.js

@@ -1,5 +1,3 @@
-import React from 'react';
-import PropTypes from 'prop-types';
 import Icon from 'gabsocial/components/icon';
 import { shortNumberFormat } from 'gabsocial/utils/numbers';
 

app/javascript/gabsocial/components/intersection_observer_article.js

@@ -1,5 +1,3 @@
-import React from 'react';
-import PropTypes from 'prop-types';
 import scheduleIdleTask from '../utils/schedule_idle_task';
 import getRectFromEntry from '../utils/get_rect_from_entry';
 import { is } from 'immutable';
@@ -9,7 +7,7 @@ const updateOnPropsForRendered = ['id', 'index', 'listLength'];
 // Diff these props in the "unrendered" state
 const updateOnPropsForUnrendered = ['id', 'index', 'listLength', 'cachedHeight'];
 
-export default class IntersectionObserverArticle extends React.Component {
+export default class IntersectionObserverArticle extends Component {
 
   static propTypes = {
     intersectionObserverWrapper: PropTypes.object.isRequired,

app/javascript/gabsocial/components/investor_badge.js

@@ -1,4 +1,3 @@
-import React from 'react';
 
 const InvestorBadge = () => (
   <span className='badge badge--investor'>Investor</span>

app/javascript/gabsocial/components/load_gap.js

@@ -1,5 +1,3 @@
-import React from 'react';
-import PropTypes from 'prop-types';
 import { injectIntl, defineMessages } from 'react-intl';
 import Icon from 'gabsocial/components/icon';
 
@@ -8,7 +6,7 @@ const messages = defineMessages({
 });
 
 export default @injectIntl
-class LoadGap extends React.PureComponent {
+class LoadGap extends PureComponent {
 
   static propTypes = {
     disabled: PropTypes.bool,

app/javascript/gabsocial/components/load_more.js

@@ -1,8 +1,6 @@
-import React from 'react';
 import { FormattedMessage } from 'react-intl';
-import PropTypes from 'prop-types';
 
-export default class LoadMore extends React.PureComponent {
+export default class LoadMore extends PureComponent {
 
   static propTypes = {
     onClick: PropTypes.func,

app/javascript/gabsocial/components/loading_indicator.js

@@ -1,4 +1,3 @@
-import React from 'react';
 import { FormattedMessage } from 'react-intl';
 
 const LoadingIndicator = () => (

app/javascript/gabsocial/components/media_gallery.js

@@ -1,6 +1,4 @@
-import React from 'react';
 import ImmutablePropTypes from 'react-immutable-proptypes';
-import PropTypes from 'prop-types';
 import { is } from 'immutable';
 import IconButton from './icon_button';
 import { defineMessages, injectIntl, FormattedMessage } from 'react-intl';
@@ -13,7 +11,7 @@ const messages = defineMessages({
   toggle_visible: { id: 'media_gallery.toggle_visible', defaultMessage: 'Toggle visibility' },
 });
 
-class Item extends React.PureComponent {
+class Item extends PureComponent {
 
   static propTypes = {
     attachment: ImmutablePropTypes.map.isRequired,
@@ -232,7 +230,7 @@ class Item extends React.PureComponent {
 }
 
 export default @injectIntl
-class MediaGallery extends React.PureComponent {
+class MediaGallery extends PureComponent {
 
   static propTypes = {
     sensitive: PropTypes.bool,

app/javascript/gabsocial/components/missing_indicator.js

@@ -1,4 +1,3 @@
-import React from 'react';
 import { FormattedMessage } from 'react-intl';
 
 const MissingIndicator = () => (

app/javascript/gabsocial/components/modal_root.js

@@ -1,7 +1,4 @@
-import React from 'react';
-import PropTypes from 'prop-types';
 import { injectIntl, FormattedMessage, defineMessages } from 'react-intl';
-import { connect } from 'react-redux';
 import { openModal } from '../actions/modal';
 import { cancelReplyCompose } from '../actions/compose';
 
@@ -22,7 +19,7 @@ const mapDispatchToProps = (dispatch) => ({
   }
 });
 
-class ModalRoot extends React.PureComponent {
+class ModalRoot extends PureComponent {
 
   static propTypes = {
     children: PropTypes.node,

app/javascript/gabsocial/components/permalink.js

@@ -1,7 +1,5 @@
-import React from 'react';
-import PropTypes from 'prop-types';
 
-export default class Permalink extends React.PureComponent {
+export default class Permalink extends PureComponent {
 
   static contextTypes = {
     router: PropTypes.object,

app/javascript/gabsocial/components/poll.js

@@ -1,5 +1,3 @@
-import React from 'react';
-import PropTypes from 'prop-types';
 import ImmutablePropTypes from 'react-immutable-proptypes';
 import ImmutablePureComponent from 'react-immutable-pure-component';
 import { defineMessages, injectIntl, FormattedMessage } from 'react-intl';

app/javascript/gabsocial/components/pro_badge.js

@@ -1,4 +1,3 @@
-import React from 'react';
 
 const ProBadge = () => (
   <span className='badge badge--pro'>Pro</span>

app/javascript/gabsocial/components/relative_timestamp.js

@@ -1,6 +1,4 @@
-import React from 'react';
 import { injectIntl, defineMessages } from 'react-intl';
-import PropTypes from 'prop-types';
 
 const messages = defineMessages({
   just_now: { id: 'relative_time.just_now', defaultMessage: 'now' },
@@ -112,7 +110,7 @@ const timeRemainingString = (intl, date, now) => {
 };
 
 export default @injectIntl
-class RelativeTimestamp extends React.Component {
+class RelativeTimestamp extends Component {
 
   static propTypes = {
     intl: PropTypes.object.isRequired,

app/javascript/gabsocial/components/scrollable_list.js

@@ -1,5 +1,4 @@
 import React, { PureComponent } from 'react';
-import PropTypes from 'prop-types';
 import IntersectionObserverArticleContainer from '../containers/intersection_observer_article_container';
 import LoadMore from './load_more';
 import IntersectionObserverWrapper from '../features/ui/util/intersection_observer_wrapper';

app/javascript/gabsocial/components/setting_text.js

@@ -1,8 +1,6 @@
-import React from 'react';
-import PropTypes from 'prop-types';
 import ImmutablePropTypes from 'react-immutable-proptypes';
 
-export default class SettingText extends React.PureComponent {
+export default class SettingText extends PureComponent {
 
   static propTypes = {
     settings: ImmutablePropTypes.map.isRequired,

app/javascript/gabsocial/components/status.js

@@ -1,6 +1,4 @@
-import React from 'react';
 import ImmutablePropTypes from 'react-immutable-proptypes';
-import PropTypes from 'prop-types';
 import Avatar from './avatar';
 import AvatarOverlay from './avatar_overlay';
 import AvatarComposite from './avatar_composite';

app/javascript/gabsocial/components/status_action_bar.js

@@ -1,8 +1,5 @@
 
-import React from 'react';
-import { connect } from 'react-redux';
 import ImmutablePropTypes from 'react-immutable-proptypes';
-import PropTypes from 'prop-types';
 import IconButton from './icon_button';
 import DropdownMenuContainer from '../containers/dropdown_menu_container';
 import { defineMessages, injectIntl } from 'react-intl';

app/javascript/gabsocial/components/status_content.js

@@ -1,6 +1,4 @@
-import React from 'react';
 import ImmutablePropTypes from 'react-immutable-proptypes';
-import PropTypes from 'prop-types';
 import { isRtl } from '../utils/rtl';
 import { FormattedMessage } from 'react-intl';
 import Permalink from './permalink';
@@ -9,7 +7,7 @@ import Icon from 'gabsocial/components/icon';
 
 const MAX_HEIGHT = 642; // 20px * 32 (+ 2px padding at the top)
 
-export default class StatusContent extends React.PureComponent {
+export default class StatusContent extends PureComponent {
 
   static contextTypes = {
     router: PropTypes.object,

app/javascript/gabsocial/components/status_list.js

@@ -1,8 +1,6 @@
 import { debounce } from 'lodash';
-import React from 'react';
 import { FormattedMessage } from 'react-intl';
 import ImmutablePropTypes from 'react-immutable-proptypes';
-import PropTypes from 'prop-types';
 import StatusContainer from '../containers/status_container';
 import ImmutablePureComponent from 'react-immutable-pure-component';
 import LoadGap from './load_gap';

app/javascript/gabsocial/components/timeline_queue_button_header.js

@@ -1,10 +1,8 @@
-import React from 'react';
-import PropTypes from 'prop-types';
 import { FormattedMessage } from 'react-intl';
 import { shortNumberFormat } from '../utils/numbers';
 import classNames from 'classnames';
 
-export default class TimelineQueueButtonHeader extends React.PureComponent {
+export default class TimelineQueueButtonHeader extends PureComponent {
   static propTypes = {
     onClick: PropTypes.func.isRequired,
     count: PropTypes.number,

app/javascript/gabsocial/components/verification_badge.js

@@ -1,4 +1,3 @@
-import React from 'react';
 import Icon from './icon';
 
 const VerificationBadge = () => (

app/javascript/gabsocial/containers/account_container.js

@@ -1,5 +1,3 @@
-import React from 'react';
-import { connect } from 'react-redux';
 import { defineMessages, injectIntl, FormattedMessage } from 'react-intl';
 import { makeGetAccount } from '../selectors';
 import Account from '../components/account';

app/javascript/gabsocial/containers/compose_container.js

@@ -1,6 +1,4 @@
-import React from 'react';
 import { Provider } from 'react-redux';
-import PropTypes from 'prop-types';
 import configureStore from '../store/configureStore';
 import { hydrateStore } from '../actions/store';
 import { IntlProvider, addLocaleData } from 'react-intl';
@@ -20,7 +18,7 @@ if (initialState) {
 
 store.dispatch(fetchCustomEmojis());
 
-export default class TimelineContainer extends React.PureComponent {
+export default class TimelineContainer extends PureComponent {
 
   static propTypes = {
     locale: PropTypes.string.isRequired,

app/javascript/gabsocial/containers/domain_container.js

@@ -1,5 +1,3 @@
-import React from 'react';
-import { connect } from 'react-redux';
 import { blockDomain, unblockDomain } from '../actions/domain_blocks';
 import { defineMessages, injectIntl, FormattedMessage } from 'react-intl';
 import Domain from '../components/domain';

app/javascript/gabsocial/containers/dropdown_menu_container.js

@@ -1,6 +1,5 @@
 import { openDropdownMenu, closeDropdownMenu } from '../actions/dropdown_menu';
 import { openModal, closeModal } from '../actions/modal';
-import { connect } from 'react-redux';
 import DropdownMenu from '../components/dropdown_menu';
 import { isUserTouching } from '../utils/is_mobile';
 

app/javascript/gabsocial/containers/gabsocial.js

@@ -1,8 +1,6 @@
 'use strict';
 
-import React from 'react';
 import { Provider, connect } from 'react-redux';
-import PropTypes from 'prop-types';
 import configureStore from '../store/configureStore';
 import { INTRODUCTION_VERSION } from '../actions/onboarding';
 import { BrowserRouter, Route } from 'react-router-dom';
@@ -37,7 +35,7 @@ const mapStateToProps = (state) => {
 }
 
 @connect(mapStateToProps)
-class GabSocialMount extends React.PureComponent {
+class GabSocialMount extends PureComponent {
 
   static propTypes = {
     showIntroduction: PropTypes.bool,
@@ -62,7 +60,7 @@ class GabSocialMount extends React.PureComponent {
 
 }
 
-export default class GabSocial extends React.PureComponent {
+export default class GabSocial extends PureComponent {
 
   static propTypes = {
     locale: PropTypes.string.isRequired,

app/javascript/gabsocial/containers/intersection_observer_article_container.js

@@ -1,4 +1,3 @@
-import { connect } from 'react-redux';
 import IntersectionObserverArticle from '../components/intersection_observer_article';
 import { setHeight } from '../actions/height_cache';
 

app/javascript/gabsocial/containers/media_container.js

@@ -1,6 +1,5 @@
 import React, { PureComponent, Fragment } from 'react';
 import ReactDOM from 'react-dom';
-import PropTypes from 'prop-types';
 import { IntlProvider, addLocaleData } from 'react-intl';
 import { getLocale } from '../locales';
 import MediaGallery from '../components/media_gallery';

app/javascript/gabsocial/containers/poll_container.js

@@ -1,4 +1,3 @@
-import { connect } from 'react-redux';
 import Poll from 'gabsocial/components/poll';
 
 const mapStateToProps = (state, { pollId }) => ({

app/javascript/gabsocial/containers/status_container.js

@@ -1,5 +1,3 @@
-import React from 'react';
-import { connect } from 'react-redux';
 import Status from '../components/status';
 import { makeGetStatus } from '../selectors';
 import {

app/javascript/gabsocial/containers/timeline_container.js

@@ -1,7 +1,6 @@
 import React, { Fragment } from 'react';
 import ReactDOM from 'react-dom';
 import { Provider } from 'react-redux';
-import PropTypes from 'prop-types';
 import configureStore from '../store/configureStore';
 import { hydrateStore } from '../actions/store';
 import { IntlProvider, addLocaleData } from 'react-intl';
@@ -20,7 +19,7 @@ if (initialState) {
   store.dispatch(hydrateStore(initialState));
 }
 
-export default class TimelineContainer extends React.PureComponent {
+export default class TimelineContainer extends PureComponent {
 
   static propTypes = {
     locale: PropTypes.string.isRequired,

app/javascript/gabsocial/features/account/components/header.js

@@ -1,8 +1,6 @@
 'use strict';
 
-import React from 'react';
 import ImmutablePropTypes from 'react-immutable-proptypes';
-import PropTypes from 'prop-types';
 import { defineMessages, injectIntl, FormattedMessage } from 'react-intl';
 import Button from 'gabsocial/components/button';
 import ImmutablePureComponent from 'react-immutable-pure-component';

app/javascript/gabsocial/features/account_gallery/components/media_item.js

@@ -1,5 +1,3 @@
-import React from 'react';
-import PropTypes from 'prop-types';
 import ImmutablePropTypes from 'react-immutable-proptypes';
 import ImmutablePureComponent from 'react-immutable-pure-component';
 import Icon from 'gabsocial/components/icon';

app/javascript/gabsocial/features/account_gallery/index.js

@@ -1,7 +1,4 @@
-import React from 'react';
-import { connect } from 'react-redux';
 import ImmutablePropTypes from 'react-immutable-proptypes';
-import PropTypes from 'prop-types';
 import {
   fetchAccount,
   fetchAccountByUsername,

app/javascript/gabsocial/features/account_timeline/components/header.js

@@ -1,6 +1,4 @@
-import React from 'react';
 import ImmutablePropTypes from 'react-immutable-proptypes';
-import PropTypes from 'prop-types';
 import InnerHeader from '../../account/components/header';
 import ImmutablePureComponent from 'react-immutable-pure-component';
 import MovedNote from './moved_note';

app/javascript/gabsocial/features/account_timeline/components/moved_note.js

@@ -1,5 +1,3 @@
-import React from 'react';
-import PropTypes from 'prop-types';
 import ImmutablePropTypes from 'react-immutable-proptypes';
 import { FormattedMessage } from 'react-intl';
 import ImmutablePureComponent from 'react-immutable-pure-component';

app/javascript/gabsocial/features/account_timeline/containers/header_container.js

@@ -1,5 +1,3 @@
-import React from 'react';
-import { connect } from 'react-redux';
 import { makeGetAccount } from '../../../selectors';
 import Header from '../components/header';
 import {

app/javascript/gabsocial/features/account_timeline/index.js

@@ -1,7 +1,4 @@
-import React from 'react';
-import { connect } from 'react-redux';
 import ImmutablePropTypes from 'react-immutable-proptypes';
-import PropTypes from 'prop-types';
 import { fetchAccount, fetchAccountByUsername } from '../../actions/accounts';
 import { expandAccountFeaturedTimeline, expandAccountTimeline } from '../../actions/timelines';
 import StatusList from '../../components/status_list';

app/javascript/gabsocial/features/blocks/index.js

@@ -1,10 +1,7 @@
-import React from 'react';
-import { connect } from 'react-redux';
 import { defineMessages, injectIntl, FormattedMessage } from 'react-intl';
 import ImmutablePureComponent from 'react-immutable-pure-component';
 import ImmutablePropTypes from 'react-immutable-proptypes';
 import { debounce } from 'lodash';
-import PropTypes from 'prop-types';
 import LoadingIndicator from '../../components/loading_indicator';
 import Column from '../ui/components/column';
 import AccountContainer from '../../containers/account_container';

app/javascript/gabsocial/features/community_timeline/components/column_settings.js

@@ -1,11 +1,9 @@
-import React from 'react';
-import PropTypes from 'prop-types';
 import ImmutablePropTypes from 'react-immutable-proptypes';
 import { injectIntl, FormattedMessage } from 'react-intl';
 import SettingToggle from '../../notifications/components/setting_toggle';
 
 export default @injectIntl
-class ColumnSettings extends React.PureComponent {
+class ColumnSettings extends PureComponent {
 
   static propTypes = {
     settings: ImmutablePropTypes.map.isRequired,

app/javascript/gabsocial/features/community_timeline/containers/column_settings_container.js

@@ -1,4 +1,3 @@
-import { connect } from 'react-redux';
 import ColumnSettings from '../components/column_settings';
 import { changeSetting } from '../../../actions/settings';
 

app/javascript/gabsocial/features/community_timeline/index.js

@@ -1,7 +1,4 @@
-import React from 'react';
-import { connect } from 'react-redux';
 import { defineMessages, injectIntl, FormattedMessage } from 'react-intl';
-import PropTypes from 'prop-types';
 import StatusListContainer from '../ui/containers/status_list_container';
 import Column from '../../components/column';
 import ColumnSettingsContainer from './containers/column_settings_container';
@@ -35,7 +32,7 @@ const mapStateToProps = state => {
 
 export default @connect(mapStateToProps)
 @injectIntl
-class CommunityTimeline extends React.PureComponent {
+class CommunityTimeline extends PureComponent {
 
   static contextTypes = {
     router: PropTypes.object,

app/javascript/gabsocial/features/compose/components/action_bar.js

@@ -1,8 +1,5 @@
-import React from 'react';
-import { connect } from 'react-redux';
 import { openModal } from '../../../actions/modal';
 import ImmutablePropTypes from 'react-immutable-proptypes';
-import PropTypes from 'prop-types';
 import DropdownMenuContainer from '../../../containers/dropdown_menu_container';
 import { defineMessages, injectIntl } from 'react-intl';
 import { meUsername } from 'gabsocial/initial_state';
@@ -25,7 +22,7 @@ const mapDispatchToProps = (dispatch) => ({
   },
 });
 
-class ActionBar extends React.PureComponent {
+class ActionBar extends PureComponent {
 
   static propTypes = {
     intl: PropTypes.object.isRequired,

app/javascript/gabsocial/features/compose/components/autosuggest_account.js

@@ -1,4 +1,3 @@
-import React from 'react';
 import Avatar from '../../../components/avatar';
 import DisplayName from '../../../components/display_name';
 import ImmutablePropTypes from 'react-immutable-proptypes';

app/javascript/gabsocial/features/compose/components/character_counter.js

@@ -1,8 +1,6 @@
-import React from 'react';
-import PropTypes from 'prop-types';
 import { length } from 'stringz';
 
-export default class CharacterCounter extends React.PureComponent {
+export default class CharacterCounter extends PureComponent {
 
   static propTypes = {
     text: PropTypes.string.isRequired,

app/javascript/gabsocial/features/compose/components/compose_form.js

@@ -1,8 +1,6 @@
-import React from 'react';
 import CharacterCounter from './character_counter';
 import Button from '../../../components/button';
 import ImmutablePropTypes from 'react-immutable-proptypes';
-import PropTypes from 'prop-types';
 import classNames from 'classnames';
 import ReplyIndicatorContainer from '../containers/reply_indicator_container';
 import AutosuggestTextarea from '../../../components/autosuggest_textarea';

app/javascript/gabsocial/features/compose/components/emoji_picker_dropdown.js

@@ -1,5 +1,3 @@
-import React from 'react';
-import PropTypes from 'prop-types';
 import { defineMessages, injectIntl } from 'react-intl';
 import { EmojiPicker as EmojiPickerAsync } from '../../ui/util/async-components';
 import Overlay from 'react-overlays/lib/Overlay';
@@ -44,7 +42,7 @@ const categoriesSort = [
   'flags',
 ];
 
-class ModifierPickerMenu extends React.PureComponent {
+class ModifierPickerMenu extends PureComponent {
 
   static propTypes = {
     active: PropTypes.bool,
@@ -105,7 +103,7 @@ class ModifierPickerMenu extends React.PureComponent {
 
 }
 
-class ModifierPicker extends React.PureComponent {
+class ModifierPicker extends PureComponent {
 
   static propTypes = {
     active: PropTypes.bool,
@@ -142,7 +140,7 @@ class ModifierPicker extends React.PureComponent {
 }
 
 @injectIntl
-class EmojiPickerMenu extends React.PureComponent {
+class EmojiPickerMenu extends PureComponent {
 
   static propTypes = {
     custom_emojis: ImmutablePropTypes.list,
@@ -279,7 +277,7 @@ class EmojiPickerMenu extends React.PureComponent {
 }
 
 export default @injectIntl
-class EmojiPickerDropdown extends React.PureComponent {
+class EmojiPickerDropdown extends PureComponent {
 
   static propTypes = {
     custom_emojis: ImmutablePropTypes.list,

app/javascript/gabsocial/features/compose/components/navigation_bar.js

@@ -1,5 +1,3 @@
-import React from 'react';
-import PropTypes from 'prop-types';
 import ImmutablePropTypes from 'react-immutable-proptypes';
 import ActionBar from './action_bar';
 import Avatar from '../../../components/avatar';

app/javascript/gabsocial/features/compose/components/poll_button.js

@@ -1,6 +1,4 @@
-import React from 'react';
 import IconButton from '../../../components/icon_button';
-import PropTypes from 'prop-types';
 import { defineMessages, injectIntl } from 'react-intl';
 
 const messages = defineMessages({
@@ -15,7 +13,7 @@ const iconStyle = {
 
 export default
 @injectIntl
-class PollButton extends React.PureComponent {
+class PollButton extends PureComponent {
 
   static propTypes = {
     disabled: PropTypes.bool,

app/javascript/gabsocial/features/compose/components/poll_form.js

@@ -1,7 +1,5 @@
 'use strict';
 
-import React from 'react';
-import PropTypes from 'prop-types';
 import ImmutablePropTypes from 'react-immutable-proptypes';
 import ImmutablePureComponent from 'react-immutable-pure-component';
 import { defineMessages, injectIntl, FormattedMessage } from 'react-intl';
@@ -21,7 +19,7 @@ const messages = defineMessages({
 });
 
 @injectIntl
-class Option extends React.PureComponent {
+class Option extends PureComponent {
 
   static propTypes = {
     title: PropTypes.string.isRequired,

app/javascript/gabsocial/features/compose/components/privacy_dropdown.js

@@ -1,5 +1,3 @@
-import React from 'react';
-import PropTypes from 'prop-types';
 import { injectIntl, defineMessages } from 'react-intl';
 import IconButton from '../../../components/icon_button';
 import Overlay from 'react-overlays/lib/Overlay';
@@ -22,7 +20,7 @@ const messages = defineMessages({
 
 const listenerOptions = detectPassiveEvents.hasSupport ? { passive: true } : false;
 
-class PrivacyDropdownMenu extends React.PureComponent {
+class PrivacyDropdownMenu extends PureComponent {
 
   static propTypes = {
     style: PropTypes.object,
@@ -150,7 +148,7 @@ class PrivacyDropdownMenu extends React.PureComponent {
 }
 
 export default @injectIntl
-class PrivacyDropdown extends React.PureComponent {
+class PrivacyDropdown extends PureComponent {
 
   static propTypes = {
     isUserTouching: PropTypes.func,

app/javascript/gabsocial/features/compose/components/reply_indicator.js

@@ -1,6 +1,4 @@
-import React from 'react';
 import ImmutablePropTypes from 'react-immutable-proptypes';
-import PropTypes from 'prop-types';
 import Avatar from '../../../components/avatar';
 import IconButton from '../../../components/icon_button';
 import DisplayName from '../../../components/display_name';

app/javascript/gabsocial/features/compose/components/search.js

@@ -1,5 +1,3 @@
-import React from 'react';
-import PropTypes from 'prop-types';
 import { defineMessages, injectIntl, FormattedMessage } from 'react-intl';
 import Overlay from 'react-overlays/lib/Overlay';
 import Motion from '../../ui/util/optional_motion';
@@ -11,7 +9,7 @@ const messages = defineMessages({
   placeholder: { id: 'search.placeholder', defaultMessage: 'Search' },
 });
 
-class SearchPopout extends React.PureComponent {
+class SearchPopout extends PureComponent {
 
   static propTypes = {
     style: PropTypes.object,
@@ -43,7 +41,7 @@ class SearchPopout extends React.PureComponent {
 }
 
 export default @injectIntl
-class Search extends React.PureComponent {
+class Search extends PureComponent {
 
   static contextTypes = {
     router: PropTypes.object.isRequired,

app/javascript/gabsocial/features/compose/components/search_results.js

@@ -1,5 +1,3 @@
-import React from 'react';
-import PropTypes from 'prop-types';
 import ImmutablePropTypes from 'react-immutable-proptypes';
 import { FormattedMessage, defineMessages, injectIntl } from 'react-intl';
 import AccountContainer from '../../../containers/account_container';

app/javascript/gabsocial/features/compose/components/text_icon_button.js

@@ -1,7 +1,5 @@
-import React from 'react';
-import PropTypes from 'prop-types';
 
-export default class TextIconButton extends React.PureComponent {
+export default class TextIconButton extends PureComponent {
 
   static propTypes = {
     label: PropTypes.string.isRequired,

app/javascript/gabsocial/features/compose/components/upload.js

@@ -1,6 +1,4 @@
-import React from 'react';
 import ImmutablePropTypes from 'react-immutable-proptypes';
-import PropTypes from 'prop-types';
 import Motion from '../../ui/util/optional_motion';
 import spring from 'react-motion/lib/spring';
 import ImmutablePureComponent from 'react-immutable-pure-component';

app/javascript/gabsocial/features/compose/components/upload_button.js

@@ -1,8 +1,5 @@
-import React from 'react';
 import IconButton from '../../../components/icon_button';
-import PropTypes from 'prop-types';
 import { defineMessages, injectIntl } from 'react-intl';
-import { connect } from 'react-redux';
 import ImmutablePureComponent from 'react-immutable-pure-component';
 import ImmutablePropTypes from 'react-immutable-proptypes';
 

app/javascript/gabsocial/features/compose/components/upload_form.js

@@ -1,4 +1,3 @@
-import React from 'react';
 import ImmutablePropTypes from 'react-immutable-proptypes';
 import UploadProgressContainer from '../containers/upload_progress_container';
 import ImmutablePureComponent from 'react-immutable-pure-component';

app/javascript/gabsocial/features/compose/components/upload_progress.js

@@ -1,11 +1,9 @@
-import React from 'react';
-import PropTypes from 'prop-types';
 import Motion from '../../ui/util/optional_motion';
 import spring from 'react-motion/lib/spring';
 import { FormattedMessage } from 'react-intl';
 import Icon from 'gabsocial/components/icon';
 
-export default class UploadProgress extends React.PureComponent {
+export default class UploadProgress extends PureComponent {
 
   static propTypes = {
     active: PropTypes.bool,

app/javascript/gabsocial/features/compose/components/warning.js

@@ -1,9 +1,7 @@
-import React from 'react';
-import PropTypes from 'prop-types';
 import Motion from '../../ui/util/optional_motion';
 import spring from 'react-motion/lib/spring';
 
-export default class Warning extends React.PureComponent {
+export default class Warning extends PureComponent {
 
   static propTypes = {
     message: PropTypes.node.isRequired,

app/javascript/gabsocial/features/compose/containers/autosuggest_account_container.js

@@ -1,4 +1,3 @@
-import { connect } from 'react-redux';
 import AutosuggestAccount from '../components/autosuggest_account';
 import { makeGetAccount } from '../../../selectors';
 

app/javascript/gabsocial/features/compose/containers/compose_form_container.js

@@ -1,4 +1,3 @@
-import { connect } from 'react-redux';
 import ComposeForm from '../components/compose_form';
 import {
   changeCompose,

app/javascript/gabsocial/features/compose/containers/emoji_picker_dropdown_container.js

@@ -1,4 +1,3 @@
-import { connect } from 'react-redux';
 import EmojiPickerDropdown from '../components/emoji_picker_dropdown';
 import { changeSetting } from '../../../actions/settings';
 import { createSelector } from 'reselect';

app/javascript/gabsocial/features/compose/containers/poll_button_container.js

@@ -1,4 +1,3 @@
-import { connect } from 'react-redux';
 import PollButton from '../components/poll_button';
 import { addPoll, removePoll } from '../../../actions/compose';
 

app/javascript/gabsocial/features/compose/containers/poll_form_container.js

@@ -1,4 +1,3 @@
-import { connect } from 'react-redux';
 import PollForm from '../components/poll_form';
 import { addPollOption, removePollOption, changePollOption, changePollSettings } from '../../../actions/compose';
 import {

app/javascript/gabsocial/features/compose/containers/privacy_dropdown_container.js

@@ -1,4 +1,3 @@
-import { connect } from 'react-redux';
 import PrivacyDropdown from '../components/privacy_dropdown';
 import { changeComposeVisibility } from '../../../actions/compose';
 import { openModal, closeModal } from '../../../actions/modal';

app/javascript/gabsocial/features/compose/containers/reply_indicator_container.js

@@ -1,4 +1,3 @@
-import { connect } from 'react-redux';
 import { cancelReplyCompose } from '../../../actions/compose';
 import { makeGetStatus } from '../../../selectors';
 import ReplyIndicator from '../components/reply_indicator';

app/javascript/gabsocial/features/compose/containers/search_container.js

@@ -1,4 +1,3 @@
-import { connect } from 'react-redux';
 import {
   changeSearch,
   clearSearch,

app/javascript/gabsocial/features/compose/containers/search_results_container.js

@@ -1,4 +1,3 @@
-import { connect } from 'react-redux';
 import SearchResults from '../components/search_results';
 import { fetchSuggestions, dismissSuggestion } from '../../../actions/suggestions';
 

app/javascript/gabsocial/features/compose/containers/sensitive_button_container.js

@@ -1,6 +1,3 @@
-import React from 'react';
-import { connect } from 'react-redux';
-import PropTypes from 'prop-types';
 import classNames from 'classnames';
 import { changeComposeSensitivity } from 'gabsocial/actions/compose';
 import { injectIntl, defineMessages, FormattedMessage } from 'react-intl';
@@ -23,7 +20,7 @@ const mapDispatchToProps = dispatch => ({
 
 });
 
-class SensitiveButton extends React.PureComponent {
+class SensitiveButton extends PureComponent {
 
   static propTypes = {
     active: PropTypes.bool,

app/javascript/gabsocial/features/compose/containers/spoiler_button_container.js

@@ -1,4 +1,3 @@
-import { connect } from 'react-redux';
 import TextIconButton from '../components/text_icon_button';
 import { changeComposeSpoilerness } from '../../../actions/compose';
 import { injectIntl, defineMessages } from 'react-intl';

app/javascript/gabsocial/features/compose/containers/upload_button_container.js

@@ -1,4 +1,3 @@
-import { connect } from 'react-redux';
 import UploadButton from '../components/upload_button';
 import { uploadCompose } from '../../../actions/compose';
 

app/javascript/gabsocial/features/compose/containers/upload_container.js

@@ -1,4 +1,3 @@
-import { connect } from 'react-redux';
 import Upload from '../components/upload';
 import { undoUploadCompose, changeUploadCompose } from '../../../actions/compose';
 import { openModal } from '../../../actions/modal';

app/javascript/gabsocial/features/compose/containers/upload_form_container.js

@@ -1,4 +1,3 @@
-import { connect } from 'react-redux';
 import UploadForm from '../components/upload_form';
 
 const mapStateToProps = state => ({