Fix import order with ESLint

Port d27216dc46 to glitch-soc

app/javascript/flavours/glitch/containers/account_container.jsx

@@ -1,7 +1,7 @@
-import { connect } from 'react-redux';
 import { defineMessages, injectIntl, FormattedMessage } from 'react-intl';
-import { makeGetAccount } from 'flavours/glitch/selectors';
-import Account from 'flavours/glitch/components/account';
+
+import { connect } from 'react-redux';
+
 import {
   followAccount,
   unfollowAccount,
@@ -12,7 +12,9 @@ import {
 } from 'flavours/glitch/actions/accounts';
 import { openModal } from 'flavours/glitch/actions/modal';
 import { initMuteModal } from 'flavours/glitch/actions/mutes';
+import Account from 'flavours/glitch/components/account';
 import { unfollowModal } from 'flavours/glitch/initial_state';
+import { makeGetAccount } from 'flavours/glitch/selectors';
 
 const messages = defineMessages({
   unfollowConfirm: { id: 'confirmations.unfollow.confirm', defaultMessage: 'Unfollow' },

app/javascript/flavours/glitch/containers/admin_component.jsx

@@ -1,6 +1,8 @@
-import { PureComponent } from 'react';
 import PropTypes from 'prop-types';
+import { PureComponent } from 'react';
+
 import { IntlProvider, addLocaleData } from 'react-intl';
+
 import { getLocale } from 'mastodon/locales';
 
 const { localeData, messages } = getLocale();

app/javascript/flavours/glitch/containers/compose_container.jsx

@@ -1,13 +1,18 @@
-import { PureComponent } from 'react';
-import { Provider } from 'react-redux';
 import PropTypes from 'prop-types';
-import { store } from 'flavours/glitch/store';
-import { hydrateStore } from 'flavours/glitch/actions/store';
+import { PureComponent } from 'react';
+
 import { IntlProvider, addLocaleData } from 'react-intl';
-import { getLocale } from 'mastodon/locales';
+
+import { Provider } from 'react-redux';
+
+import { fetchCustomEmojis } from 'flavours/glitch/actions/custom_emojis';
+import { hydrateStore } from 'flavours/glitch/actions/store';
 import Compose from 'flavours/glitch/features/standalone/compose';
 import initialState from 'flavours/glitch/initial_state';
-import { fetchCustomEmojis } from 'flavours/glitch/actions/custom_emojis';
+import { store } from 'flavours/glitch/store';
+
+import { getLocale } from 'mastodon/locales';
+
 
 const { localeData, messages } = getLocale();
 addLocaleData(localeData);

app/javascript/flavours/glitch/containers/domain_container.jsx

@@ -1,8 +1,10 @@
-import { connect } from 'react-redux';
-import { blockDomain, unblockDomain } from '../actions/domain_blocks';
 import { defineMessages, injectIntl, FormattedMessage } from 'react-intl';
-import { Domain } from '../components/domain';
+
+import { connect } from 'react-redux';
+
+import { blockDomain, unblockDomain } from '../actions/domain_blocks';
 import { openModal } from '../actions/modal';
+import { Domain } from '../components/domain';
 
 const messages = defineMessages({
   blockDomainConfirm: { id: 'confirmations.domain_block.confirm', defaultMessage: 'Block entire domain' },

app/javascript/flavours/glitch/containers/dropdown_menu_container.js

@@ -1,7 +1,9 @@
+import { connect } from 'react-redux';
+
 import { openDropdownMenu, closeDropdownMenu } from 'flavours/glitch/actions/dropdown_menu';
 import { openModal, closeModal } from 'flavours/glitch/actions/modal';
-import { connect } from 'react-redux';
 import DropdownMenu from 'flavours/glitch/components/dropdown_menu';
+
 import { isUserTouching } from '../is_mobile';
 
 const mapStateToProps = state => ({

app/javascript/flavours/glitch/containers/intersection_observer_article_container.js

@@ -1,6 +1,7 @@
 import { connect } from 'react-redux';
-import IntersectionObserverArticle from 'flavours/glitch/components/intersection_observer_article';
+
 import { setHeight } from 'flavours/glitch/actions/height_cache';
+import IntersectionObserverArticle from 'flavours/glitch/components/intersection_observer_article';
 
 const makeMapStateToProps = (state, props) => ({
   cachedHeight: state.getIn(['height_cache', props.saveHeightKey, props.id]),

app/javascript/flavours/glitch/containers/mastodon.jsx

@@ -1,18 +1,23 @@
 import PropTypes from 'prop-types';
 import { PureComponent } from 'react';
-import { Helmet } from 'react-helmet';
+
 import { IntlProvider, addLocaleData } from 'react-intl';
-import { Provider as ReduxProvider } from 'react-redux';
+
+import { Helmet } from 'react-helmet';
 import { BrowserRouter, Route } from 'react-router-dom';
+
+import { Provider as ReduxProvider } from 'react-redux';
+
 import { ScrollContext } from 'react-router-scroll-4';
-import { store } from 'flavours/glitch/store';
-import UI from 'flavours/glitch/features/ui';
+
 import { fetchCustomEmojis } from 'flavours/glitch/actions/custom_emojis';
-import { hydrateStore } from 'flavours/glitch/actions/store';
 import { checkDeprecatedLocalSettings } from 'flavours/glitch/actions/local_settings';
+import { hydrateStore } from 'flavours/glitch/actions/store';
 import { connectUserStream } from 'flavours/glitch/actions/streaming';
 import ErrorBoundary from 'flavours/glitch/components/error_boundary';
+import UI from 'flavours/glitch/features/ui';
 import initialState, { title as siteTitle } from 'flavours/glitch/initial_state';
+import { store } from 'flavours/glitch/store';
 import { getLocale } from 'locales';
 
 const { localeData, messages } = getLocale();

app/javascript/flavours/glitch/containers/media_container.jsx

@@ -1,18 +1,22 @@
+import PropTypes from 'prop-types';
 import { PureComponent } from 'react';
 import { createPortal } from 'react-dom';
-import PropTypes from 'prop-types';
+
 import { IntlProvider, addLocaleData } from 'react-intl';
+
 import { fromJS } from 'immutable';
-import { getLocale } from 'mastodon/locales';
-import { getScrollbarWidth } from 'flavours/glitch/utils/scrollbar';
-import MediaGallery from 'flavours/glitch/components/media_gallery';
-import Poll from 'flavours/glitch/components/poll';
+
 import { ImmutableHashtag as Hashtag } from 'flavours/glitch/components/hashtag';
+import MediaGallery from 'flavours/glitch/components/media_gallery';
 import ModalRoot from 'flavours/glitch/components/modal_root';
+import Poll from 'flavours/glitch/components/poll';
+import Audio from 'flavours/glitch/features/audio';
+import Card from 'flavours/glitch/features/status/components/card';
 import MediaModal from 'flavours/glitch/features/ui/components/media_modal';
 import Video from 'flavours/glitch/features/video';
-import Card from 'flavours/glitch/features/status/components/card';
-import Audio from 'flavours/glitch/features/audio';
+import { getScrollbarWidth } from 'flavours/glitch/utils/scrollbar';
+
+import { getLocale } from 'mastodon/locales';
 
 const { localeData, messages } = getLocale();
 addLocaleData(localeData);

app/javascript/flavours/glitch/containers/notification_purge_buttons_container.js

@@ -1,15 +1,16 @@
 //  Package imports.
-import { connect } from 'react-redux';
 import { defineMessages, injectIntl } from 'react-intl';
 
+import { connect } from 'react-redux';
+
 //  Our imports.
-import NotificationPurgeButtons from 'flavours/glitch/components/notification_purge_buttons';
+import { openModal } from 'flavours/glitch/actions/modal';
 import {
   deleteMarkedNotifications,
   enterNotificationClearingMode,
   markAllNotifications,
 } from 'flavours/glitch/actions/notifications';
-import { openModal } from 'flavours/glitch/actions/modal';
+import NotificationPurgeButtons from 'flavours/glitch/components/notification_purge_buttons';
 
 const messages = defineMessages({
   clearMessage: { id: 'notifications.marked_clear_confirmation', defaultMessage: 'Are you sure you want to permanently clear all selected notifications?' },

app/javascript/flavours/glitch/containers/poll_container.js

@@ -1,8 +1,9 @@
 import { connect } from 'react-redux';
+
 import { debounce } from 'lodash';
 
-import Poll from 'flavours/glitch/components/poll';
 import { fetchPoll, vote } from 'flavours/glitch/actions/polls';
+import Poll from 'flavours/glitch/components/poll';
 
 const mapDispatchToProps = (dispatch, { pollId }) => ({
   refresh: debounce(

app/javascript/flavours/glitch/containers/status_container.js

@@ -1,11 +1,17 @@
+import { defineMessages, injectIntl } from 'react-intl';
+
 import { connect } from 'react-redux';
-import Status from 'flavours/glitch/components/status';
-import { makeGetStatus, makeGetPictureInPicture } from 'flavours/glitch/selectors';
+
+import { initBlockModal } from 'flavours/glitch/actions/blocks';
+import { initBoostModal } from 'flavours/glitch/actions/boosts';
 import {
   replyCompose,
   mentionCompose,
   directCompose,
 } from 'flavours/glitch/actions/compose';
+import {
+  initAddFilter,
+} from 'flavours/glitch/actions/filters';
 import {
   reblog,
   favourite,
@@ -16,6 +22,11 @@ import {
   pin,
   unpin,
 } from 'flavours/glitch/actions/interactions';
+import { changeLocalSetting } from 'flavours/glitch/actions/local_settings';
+import { openModal } from 'flavours/glitch/actions/modal';
+import { initMuteModal } from 'flavours/glitch/actions/mutes';
+import { deployPictureInPicture } from 'flavours/glitch/actions/picture_in_picture';
+import { initReport } from 'flavours/glitch/actions/reports';
 import {
   muteStatus,
   unmuteStatus,
@@ -26,18 +37,10 @@ import {
   translateStatus,
   undoStatusTranslation,
 } from 'flavours/glitch/actions/statuses';
-import {
-  initAddFilter,
-} from 'flavours/glitch/actions/filters';
-import { initMuteModal } from 'flavours/glitch/actions/mutes';
-import { initBlockModal } from 'flavours/glitch/actions/blocks';
-import { initReport } from 'flavours/glitch/actions/reports';
-import { initBoostModal } from 'flavours/glitch/actions/boosts';
-import { openModal } from 'flavours/glitch/actions/modal';
-import { deployPictureInPicture } from 'flavours/glitch/actions/picture_in_picture';
-import { changeLocalSetting } from 'flavours/glitch/actions/local_settings';
-import { defineMessages, injectIntl } from 'react-intl';
+import Status from 'flavours/glitch/components/status';
 import { boostModal, favouriteModal, deleteModal } from 'flavours/glitch/initial_state';
+import { makeGetStatus, makeGetPictureInPicture } from 'flavours/glitch/selectors';
+
 import { showAlertForError } from '../actions/alerts';
 
 const messages = defineMessages({