diff --git a/.eslintrc.js b/.eslintrc.js index e779b60d4..101e91527 100644 --- a/.eslintrc.js +++ b/.eslintrc.js @@ -237,6 +237,7 @@ module.exports = { 'type', ], 'newlines-between': 'ignore', + alphabetize: { order: 'asc' }, }, ], diff --git a/app/soapbox/actions/__tests__/about-test.js b/app/soapbox/actions/__tests__/about-test.js index d0def7236..1c04c9b9e 100644 --- a/app/soapbox/actions/__tests__/about-test.js +++ b/app/soapbox/actions/__tests__/about-test.js @@ -1,5 +1,5 @@ -import { Map as ImmutableMap } from 'immutable'; import MockAdapter from 'axios-mock-adapter'; +import { Map as ImmutableMap } from 'immutable'; import { staticClient } from 'soapbox/api'; import { mockStore } from 'soapbox/test_helpers'; import { diff --git a/app/soapbox/actions/__tests__/preload-test.js b/app/soapbox/actions/__tests__/preload-test.js index 62f7ebb0e..7512f4c5e 100644 --- a/app/soapbox/actions/__tests__/preload-test.js +++ b/app/soapbox/actions/__tests__/preload-test.js @@ -1,12 +1,12 @@ import { Map as ImmutableMap } from 'immutable'; import { __stub } from 'soapbox/api'; import { mockStore } from 'soapbox/test_helpers'; +import { VERIFY_CREDENTIALS_REQUEST } from '../auth'; +import { ACCOUNTS_IMPORT } from '../importer'; import { MASTODON_PRELOAD_IMPORT, preloadMastodon, } from '../preload'; -import { VERIFY_CREDENTIALS_REQUEST } from '../auth'; -import { ACCOUNTS_IMPORT } from '../importer'; describe('preloadMastodon()', () => { it('creates the expected actions', () => { diff --git a/app/soapbox/actions/admin.js b/app/soapbox/actions/admin.js index b6a9e84c8..2b29e7479 100644 --- a/app/soapbox/actions/admin.js +++ b/app/soapbox/actions/admin.js @@ -1,5 +1,5 @@ -import { importFetchedAccount, importFetchedStatuses } from 'soapbox/actions/importer'; import { fetchRelationships } from 'soapbox/actions/accounts'; +import { importFetchedAccount, importFetchedStatuses } from 'soapbox/actions/importer'; import api from '../api'; export const ADMIN_CONFIG_FETCH_REQUEST = 'ADMIN_CONFIG_FETCH_REQUEST'; diff --git a/app/soapbox/actions/aliases.js b/app/soapbox/actions/aliases.js index facc91fe9..b525f22c7 100644 --- a/app/soapbox/actions/aliases.js +++ b/app/soapbox/actions/aliases.js @@ -1,10 +1,10 @@ import { defineMessages } from 'react-intl'; import { isLoggedIn } from 'soapbox/utils/auth'; import api from '../api'; -import { importFetchedAccount, importFetchedAccounts } from './importer'; import { showAlertForError } from './alerts'; -import snackbar from './snackbar'; +import { importFetchedAccount, importFetchedAccounts } from './importer'; import { ME_PATCH_SUCCESS } from './me'; +import snackbar from './snackbar'; export const ALIASES_SUGGESTIONS_CHANGE = 'ALIASES_SUGGESTIONS_CHANGE'; export const ALIASES_SUGGESTIONS_READY = 'ALIASES_SUGGESTIONS_READY'; diff --git a/app/soapbox/actions/auth.js b/app/soapbox/actions/auth.js index 5ea926353..8b8f02b64 100644 --- a/app/soapbox/actions/auth.js +++ b/app/soapbox/actions/auth.js @@ -8,16 +8,16 @@ */ import { defineMessages } from 'react-intl'; -import snackbar from 'soapbox/actions/snackbar'; import { createAccount } from 'soapbox/actions/accounts'; -import { fetchMeSuccess, fetchMeFail } from 'soapbox/actions/me'; -import { getLoggedInAccount, parseBaseURL } from 'soapbox/utils/auth'; import { createApp } from 'soapbox/actions/apps'; +import { fetchMeSuccess, fetchMeFail } from 'soapbox/actions/me'; import { obtainOAuthToken, revokeOAuthToken } from 'soapbox/actions/oauth'; +import snackbar from 'soapbox/actions/snackbar'; +import KVStore from 'soapbox/storage/kv_store'; +import { getLoggedInAccount, parseBaseURL } from 'soapbox/utils/auth'; import sourceCode from 'soapbox/utils/code'; import { getFeatures } from 'soapbox/utils/features'; import { isStandalone } from 'soapbox/utils/state'; -import KVStore from 'soapbox/storage/kv_store'; import api, { baseClient } from '../api'; import { importFetchedAccount } from './importer'; diff --git a/app/soapbox/actions/chats.js b/app/soapbox/actions/chats.js index f5ae40c27..eb9222750 100644 --- a/app/soapbox/actions/chats.js +++ b/app/soapbox/actions/chats.js @@ -1,5 +1,5 @@ -import { v4 as uuidv4 } from 'uuid'; import { Map as ImmutableMap } from 'immutable'; +import { v4 as uuidv4 } from 'uuid'; import { getSettings, changeSetting } from 'soapbox/actions/settings'; import { getFeatures } from 'soapbox/utils/features'; import api, { getLinks } from '../api'; diff --git a/app/soapbox/actions/compose.js b/app/soapbox/actions/compose.js index 5f225895a..82415eb0b 100644 --- a/app/soapbox/actions/compose.js +++ b/app/soapbox/actions/compose.js @@ -1,19 +1,19 @@ import { CancelToken, isCancel } from 'axios'; import { throttle } from 'lodash'; import { defineMessages } from 'react-intl'; -import { getFeatures } from 'soapbox/utils/features'; -import { isLoggedIn } from 'soapbox/utils/auth'; import snackbar from 'soapbox/actions/snackbar'; +import { isLoggedIn } from 'soapbox/utils/auth'; +import { getFeatures } from 'soapbox/utils/features'; import api from '../api'; import { search as emojiSearch } from '../features/emoji/emoji_mart_search_light'; import { tagHistory } from '../settings'; import resizeImage from '../utils/resize_image'; +import { showAlert, showAlertForError } from './alerts'; import { useEmoji } from './emojis'; import { importFetchedAccounts } from './importer'; -import { showAlert, showAlertForError } from './alerts'; +import { uploadMedia, fetchMedia, updateMedia } from './media'; import { openModal, closeModal } from './modal'; import { getSettings } from './settings'; -import { uploadMedia, fetchMedia, updateMedia } from './media'; import { createStatus } from './statuses'; let cancelFetchComposeSuggestionsAccounts; diff --git a/app/soapbox/actions/directory.js b/app/soapbox/actions/directory.js index 35e699703..bf93a5f22 100644 --- a/app/soapbox/actions/directory.js +++ b/app/soapbox/actions/directory.js @@ -1,6 +1,6 @@ import api from '../api'; -import { importFetchedAccounts } from './importer'; import { fetchRelationships } from './accounts'; +import { importFetchedAccounts } from './importer'; export const DIRECTORY_FETCH_REQUEST = 'DIRECTORY_FETCH_REQUEST'; export const DIRECTORY_FETCH_SUCCESS = 'DIRECTORY_FETCH_SUCCESS'; diff --git a/app/soapbox/actions/external_auth.js b/app/soapbox/actions/external_auth.js index 2510a24f0..f95c08be6 100644 --- a/app/soapbox/actions/external_auth.js +++ b/app/soapbox/actions/external_auth.js @@ -8,11 +8,11 @@ import { Map as ImmutableMap, fromJS } from 'immutable'; import { createApp } from 'soapbox/actions/apps'; -import { obtainOAuthToken } from 'soapbox/actions/oauth'; import { authLoggedIn, verifyCredentials, switchAccount } from 'soapbox/actions/auth'; +import { obtainOAuthToken } from 'soapbox/actions/oauth'; import { parseBaseURL } from 'soapbox/utils/auth'; -import { getFeatures } from 'soapbox/utils/features'; import sourceCode from 'soapbox/utils/code'; +import { getFeatures } from 'soapbox/utils/features'; import { baseClient } from '../api'; const fetchExternalInstance = baseURL => { diff --git a/app/soapbox/actions/groups.js b/app/soapbox/actions/groups.js index 350b67e3e..7bff19076 100644 --- a/app/soapbox/actions/groups.js +++ b/app/soapbox/actions/groups.js @@ -1,7 +1,7 @@ import { isLoggedIn } from 'soapbox/utils/auth'; import api, { getLinks } from '../api'; -import { importFetchedAccounts } from './importer'; import { fetchRelationships } from './accounts'; +import { importFetchedAccounts } from './importer'; export const GROUP_FETCH_REQUEST = 'GROUP_FETCH_REQUEST'; export const GROUP_FETCH_SUCCESS = 'GROUP_FETCH_SUCCESS'; diff --git a/app/soapbox/actions/instance.js b/app/soapbox/actions/instance.js index cc7870976..e6cf6897d 100644 --- a/app/soapbox/actions/instance.js +++ b/app/soapbox/actions/instance.js @@ -1,7 +1,7 @@ import { get } from 'lodash'; -import { parseVersion } from 'soapbox/utils/features'; -import { getAuthUserUrl } from 'soapbox/utils/auth'; import KVStore from 'soapbox/storage/kv_store'; +import { getAuthUserUrl } from 'soapbox/utils/auth'; +import { parseVersion } from 'soapbox/utils/features'; import api from '../api'; export const INSTANCE_FETCH_REQUEST = 'INSTANCE_FETCH_REQUEST'; diff --git a/app/soapbox/actions/lists.js b/app/soapbox/actions/lists.js index 95330c557..b01888884 100644 --- a/app/soapbox/actions/lists.js +++ b/app/soapbox/actions/lists.js @@ -1,7 +1,7 @@ import { isLoggedIn } from 'soapbox/utils/auth'; import api from '../api'; -import { importFetchedAccounts } from './importer'; import { showAlertForError } from './alerts'; +import { importFetchedAccounts } from './importer'; export const LIST_FETCH_REQUEST = 'LIST_FETCH_REQUEST'; export const LIST_FETCH_SUCCESS = 'LIST_FETCH_SUCCESS'; diff --git a/app/soapbox/actions/me.js b/app/soapbox/actions/me.js index 35c4fcb8c..0b92ae3be 100644 --- a/app/soapbox/actions/me.js +++ b/app/soapbox/actions/me.js @@ -1,7 +1,7 @@ import { getAuthUserId, getAuthUserUrl } from 'soapbox/utils/auth'; import api from '../api'; -import { importFetchedAccount } from './importer'; import { loadCredentials } from './auth'; +import { importFetchedAccount } from './importer'; export const ME_FETCH_REQUEST = 'ME_FETCH_REQUEST'; export const ME_FETCH_SUCCESS = 'ME_FETCH_SUCCESS'; diff --git a/app/soapbox/actions/moderation.js b/app/soapbox/actions/moderation.js index cda6f3b23..d27b5665c 100644 --- a/app/soapbox/actions/moderation.js +++ b/app/soapbox/actions/moderation.js @@ -1,8 +1,8 @@ import React from 'react'; import { defineMessages } from 'react-intl'; -import { openModal } from 'soapbox/actions/modal'; -import { deactivateUsers, deleteUsers, deleteStatus, toggleStatusSensitivity } from 'soapbox/actions/admin'; import { fetchAccountByUsername } from 'soapbox/actions/accounts'; +import { deactivateUsers, deleteUsers, deleteStatus, toggleStatusSensitivity } from 'soapbox/actions/admin'; +import { openModal } from 'soapbox/actions/modal'; import snackbar from 'soapbox/actions/snackbar'; import AccountContainer from 'soapbox/containers/account_container'; import { isLocal } from 'soapbox/utils/accounts'; diff --git a/app/soapbox/actions/notifications.js b/app/soapbox/actions/notifications.js index 396a02a40..85e3c96ce 100644 --- a/app/soapbox/actions/notifications.js +++ b/app/soapbox/actions/notifications.js @@ -1,26 +1,26 @@ -import IntlMessageFormat from 'intl-messageformat'; -import 'intl-pluralrules'; -import { defineMessages } from 'react-intl'; import { List as ImmutableList, Map as ImmutableMap, OrderedMap as ImmutableOrderedMap, } from 'immutable'; +import IntlMessageFormat from 'intl-messageformat'; +import 'intl-pluralrules'; +import { defineMessages } from 'react-intl'; import { isLoggedIn } from 'soapbox/utils/auth'; import { parseVersion, PLEROMA } from 'soapbox/utils/features'; import { joinPublicPath } from 'soapbox/utils/static'; import api, { getLinks } from '../api'; import { getFilters, regexFromFilters } from '../selectors'; import { unescapeHTML } from '../utils/html'; -import { getSettings, saveSettings } from './settings'; -import { saveMarker } from './markers'; +import { fetchRelationships } from './accounts'; import { importFetchedAccount, importFetchedAccounts, importFetchedStatus, importFetchedStatuses, } from './importer'; -import { fetchRelationships } from './accounts'; +import { saveMarker } from './markers'; +import { getSettings, saveSettings } from './settings'; export const NOTIFICATIONS_UPDATE = 'NOTIFICATIONS_UPDATE'; export const NOTIFICATIONS_UPDATE_NOOP = 'NOTIFICATIONS_UPDATE_NOOP'; diff --git a/app/soapbox/actions/preload.js b/app/soapbox/actions/preload.js index c8f2fe7d1..9a3c8e9c6 100644 --- a/app/soapbox/actions/preload.js +++ b/app/soapbox/actions/preload.js @@ -1,6 +1,6 @@ import { mapValues } from 'lodash'; -import { importFetchedAccounts } from './importer'; import { verifyCredentials } from './auth'; +import { importFetchedAccounts } from './importer'; export const PLEROMA_PRELOAD_IMPORT = 'PLEROMA_PRELOAD_IMPORT'; export const MASTODON_PRELOAD_IMPORT = 'MASTODON_PRELOAD_IMPORT'; diff --git a/app/soapbox/actions/push_notifications/index.js b/app/soapbox/actions/push_notifications/index.js index 2ffec500a..32b0ffcaf 100644 --- a/app/soapbox/actions/push_notifications/index.js +++ b/app/soapbox/actions/push_notifications/index.js @@ -1,3 +1,4 @@ +import { register, saveSettings } from './registerer'; import { SET_BROWSER_SUPPORT, SET_SUBSCRIPTION, @@ -5,7 +6,6 @@ import { SET_ALERTS, setAlerts, } from './setter'; -import { register, saveSettings } from './registerer'; export { SET_BROWSER_SUPPORT, diff --git a/app/soapbox/actions/push_notifications/registerer.js b/app/soapbox/actions/push_notifications/registerer.js index ad6cf1ffe..af798e416 100644 --- a/app/soapbox/actions/push_notifications/registerer.js +++ b/app/soapbox/actions/push_notifications/registerer.js @@ -1,7 +1,7 @@ import { createPushSubsription, updatePushSubscription } from 'soapbox/actions/push_subscriptions'; import { getVapidKey } from 'soapbox/utils/auth'; -import { decode as decodeBase64 } from '../../utils/base64'; import { pushNotificationsSetting } from '../../settings'; +import { decode as decodeBase64 } from '../../utils/base64'; import { setBrowserSupport, setSubscription, clearSubscription } from './setter'; // Taken from https://www.npmjs.com/package/web-push diff --git a/app/soapbox/actions/security.js b/app/soapbox/actions/security.js index cd9642447..cb6833543 100644 --- a/app/soapbox/actions/security.js +++ b/app/soapbox/actions/security.js @@ -4,8 +4,8 @@ * @see module:soapbox/actions/auth */ -import { getLoggedInAccount } from 'soapbox/utils/auth'; import snackbar from 'soapbox/actions/snackbar'; +import { getLoggedInAccount } from 'soapbox/utils/auth'; import api from '../api'; import { AUTH_LOGGED_OUT, messages } from './auth'; diff --git a/app/soapbox/actions/settings.js b/app/soapbox/actions/settings.js index f956d687f..3651d48e6 100644 --- a/app/soapbox/actions/settings.js +++ b/app/soapbox/actions/settings.js @@ -1,5 +1,5 @@ -import { debounce } from 'lodash'; import { Map as ImmutableMap, List as ImmutableList, OrderedSet as ImmutableOrderedSet } from 'immutable'; +import { debounce } from 'lodash'; import { createSelector } from 'reselect'; import { patchMe } from 'soapbox/actions/me'; import { isLoggedIn } from 'soapbox/utils/auth'; diff --git a/app/soapbox/actions/soapbox.js b/app/soapbox/actions/soapbox.js index 738cd6066..225e8c280 100644 --- a/app/soapbox/actions/soapbox.js +++ b/app/soapbox/actions/soapbox.js @@ -1,8 +1,8 @@ import { Map as ImmutableMap, List as ImmutableList } from 'immutable'; import { createSelector } from 'reselect'; -import { getFeatures } from 'soapbox/utils/features'; import { getHost } from 'soapbox/actions/instance'; import KVStore from 'soapbox/storage/kv_store'; +import { getFeatures } from 'soapbox/utils/features'; import api, { staticClient } from '../api'; export const SOAPBOX_CONFIG_REQUEST_SUCCESS = 'SOAPBOX_CONFIG_REQUEST_SUCCESS'; diff --git a/app/soapbox/actions/statuses.js b/app/soapbox/actions/statuses.js index 19bda082b..25b65ec25 100644 --- a/app/soapbox/actions/statuses.js +++ b/app/soapbox/actions/statuses.js @@ -2,9 +2,9 @@ import { isLoggedIn } from 'soapbox/utils/auth'; import { getFeatures } from 'soapbox/utils/features'; import { shouldHaveCard } from 'soapbox/utils/status'; import api from '../api'; -import { deleteFromTimelines } from './timelines'; import { importFetchedStatus, importFetchedStatuses } from './importer'; import { openModal } from './modal'; +import { deleteFromTimelines } from './timelines'; export const STATUS_CREATE_REQUEST = 'STATUS_CREATE_REQUEST'; export const STATUS_CREATE_SUCCESS = 'STATUS_CREATE_SUCCESS'; diff --git a/app/soapbox/actions/streaming.js b/app/soapbox/actions/streaming.js index ca93f0506..2dd6d45e5 100644 --- a/app/soapbox/actions/streaming.js +++ b/app/soapbox/actions/streaming.js @@ -1,6 +1,9 @@ import { getSettings } from 'soapbox/actions/settings'; import messages from 'soapbox/locales/messages'; import { connectStream } from '../stream'; +import { updateConversations } from './conversations'; +import { fetchFilters } from './filters'; +import { updateNotificationsQueue, expandNotifications } from './notifications'; import { deleteFromTimelines, expandHomeTimeline, @@ -8,9 +11,6 @@ import { disconnectTimeline, processTimelineUpdate, } from './timelines'; -import { updateNotificationsQueue, expandNotifications } from './notifications'; -import { updateConversations } from './conversations'; -import { fetchFilters } from './filters'; export const STREAMING_CHAT_UPDATE = 'STREAMING_CHAT_UPDATE'; export const STREAMING_FOLLOW_RELATIONSHIPS_UPDATE = 'STREAMING_FOLLOW_RELATIONSHIPS_UPDATE'; diff --git a/app/soapbox/actions/suggestions.js b/app/soapbox/actions/suggestions.js index f239530f0..e2ca4df7b 100644 --- a/app/soapbox/actions/suggestions.js +++ b/app/soapbox/actions/suggestions.js @@ -1,8 +1,8 @@ import { isLoggedIn } from 'soapbox/utils/auth'; import { getFeatures } from 'soapbox/utils/features'; import api from '../api'; -import { importFetchedAccounts } from './importer'; import { fetchRelationships } from './accounts'; +import { importFetchedAccounts } from './importer'; export const SUGGESTIONS_FETCH_REQUEST = 'SUGGESTIONS_FETCH_REQUEST'; export const SUGGESTIONS_FETCH_SUCCESS = 'SUGGESTIONS_FETCH_SUCCESS'; diff --git a/app/soapbox/api.js b/app/soapbox/api.js index 79c0400bc..58e6f6657 100644 --- a/app/soapbox/api.js +++ b/app/soapbox/api.js @@ -8,8 +8,8 @@ import axios from 'axios'; import LinkHeader from 'http-link-header'; import { createSelector } from 'reselect'; -import { getAccessToken, getAppToken, parseBaseURL } from 'soapbox/utils/auth'; import { BACKEND_URL, FE_SUBDIRECTORY } from 'soapbox/build_config'; +import { getAccessToken, getAppToken, parseBaseURL } from 'soapbox/utils/auth'; import { isURL } from 'soapbox/utils/auth'; /** diff --git a/app/soapbox/base_polyfills.js b/app/soapbox/base_polyfills.js index d54ed977c..60c546bf4 100644 --- a/app/soapbox/base_polyfills.js +++ b/app/soapbox/base_polyfills.js @@ -4,9 +4,9 @@ import 'intl'; import 'intl/locale-data/jsonp/en'; import 'es6-symbol/implement'; import includes from 'array-includes'; +import isNaN from 'is-nan'; import assign from 'object-assign'; import values from 'object.values'; -import isNaN from 'is-nan'; import { decode as decodeBase64 } from './utils/base64'; if (!Array.prototype.includes) { diff --git a/app/soapbox/components/__mocks__/react-inlinesvg.js b/app/soapbox/components/__mocks__/react-inlinesvg.js index 33da43fde..41000c5cc 100644 --- a/app/soapbox/components/__mocks__/react-inlinesvg.js +++ b/app/soapbox/components/__mocks__/react-inlinesvg.js @@ -1,5 +1,5 @@ -import React from 'react'; import PropTypes from 'prop-types'; +import React from 'react'; export default function InlineSVG({ src }) { return ; diff --git a/app/soapbox/components/__tests__/avatar-test.js b/app/soapbox/components/__tests__/avatar-test.js index 297b0b413..6e43f30c7 100644 --- a/app/soapbox/components/__tests__/avatar-test.js +++ b/app/soapbox/components/__tests__/avatar-test.js @@ -1,5 +1,5 @@ -import React from 'react'; import { fromJS } from 'immutable'; +import React from 'react'; import { createComponent } from 'soapbox/test_helpers'; import Avatar from '../avatar'; diff --git a/app/soapbox/components/__tests__/avatar_overlay-test.js b/app/soapbox/components/__tests__/avatar_overlay-test.js index c469dcc75..0e0d2039a 100644 --- a/app/soapbox/components/__tests__/avatar_overlay-test.js +++ b/app/soapbox/components/__tests__/avatar_overlay-test.js @@ -1,5 +1,5 @@ -import React from 'react'; import { fromJS } from 'immutable'; +import React from 'react'; import { createComponent } from 'soapbox/test_helpers'; import AvatarOverlay from '../avatar_overlay'; diff --git a/app/soapbox/components/__tests__/display_name-test.js b/app/soapbox/components/__tests__/display_name-test.js index ebef28352..e717e6480 100644 --- a/app/soapbox/components/__tests__/display_name-test.js +++ b/app/soapbox/components/__tests__/display_name-test.js @@ -1,5 +1,5 @@ -import React from 'react'; import { fromJS } from 'immutable'; +import React from 'react'; import { createComponent } from 'soapbox/test_helpers'; import DisplayName from '../display_name'; diff --git a/app/soapbox/components/account.js b/app/soapbox/components/account.js index 228949067..74c17d9d7 100644 --- a/app/soapbox/components/account.js +++ b/app/soapbox/components/account.js @@ -1,17 +1,17 @@ -import React, { Fragment } from 'react'; -import { connect } from 'react-redux'; -import ImmutablePropTypes from 'react-immutable-proptypes'; -import PropTypes from 'prop-types'; -import { FormattedMessage } from 'react-intl'; -import ImmutablePureComponent from 'react-immutable-pure-component'; import classNames from 'classnames'; -import ActionButton from 'soapbox/features/ui/components/action_button'; +import PropTypes from 'prop-types'; +import React, { Fragment } from 'react'; +import ImmutablePropTypes from 'react-immutable-proptypes'; +import ImmutablePureComponent from 'react-immutable-pure-component'; +import { FormattedMessage } from 'react-intl'; +import { connect } from 'react-redux'; import emojify from 'soapbox/features/emoji/emoji'; +import ActionButton from 'soapbox/features/ui/components/action_button'; import Avatar from './avatar'; import DisplayName from './display_name'; -import Permalink from './permalink'; import Icon from './icon'; import IconButton from './icon_button'; +import Permalink from './permalink'; import RelativeTimestamp from './relative_timestamp'; const mapStateToProps = state => { diff --git a/app/soapbox/components/account_search.js b/app/soapbox/components/account_search.js index 5b83e90f9..0c7a01456 100644 --- a/app/soapbox/components/account_search.js +++ b/app/soapbox/components/account_search.js @@ -1,9 +1,9 @@ -import React from 'react'; -import PropTypes from 'prop-types'; -import { defineMessages, injectIntl } from 'react-intl'; import classNames from 'classnames'; -import Icon from 'soapbox/components/icon'; +import PropTypes from 'prop-types'; +import React from 'react'; +import { defineMessages, injectIntl } from 'react-intl'; import AutosuggestAccountInput from 'soapbox/components/autosuggest_account_input'; +import Icon from 'soapbox/components/icon'; const messages = defineMessages({ placeholder: { id: 'account_search.placeholder', defaultMessage: 'Search for an account' }, diff --git a/app/soapbox/components/attachment_list.js b/app/soapbox/components/attachment_list.js index d7875a62c..c64869b13 100644 --- a/app/soapbox/components/attachment_list.js +++ b/app/soapbox/components/attachment_list.js @@ -1,6 +1,6 @@ +import PropTypes from 'prop-types'; 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 'soapbox/components/icon'; diff --git a/app/soapbox/components/attachment_thumbs.js b/app/soapbox/components/attachment_thumbs.js index 438c2061e..7ee27f724 100644 --- a/app/soapbox/components/attachment_thumbs.js +++ b/app/soapbox/components/attachment_thumbs.js @@ -1,11 +1,11 @@ -import React from 'react'; -import { connect } from 'react-redux'; import PropTypes from 'prop-types'; +import React from 'react'; import ImmutablePropTypes from 'react-immutable-proptypes'; import ImmutablePureComponent from 'react-immutable-pure-component'; -import { MediaGallery } from 'soapbox/features/ui/util/async-components'; +import { connect } from 'react-redux'; import { openModal } from 'soapbox/actions/modal'; import Bundle from 'soapbox/features/ui/components/bundle'; +import { MediaGallery } from 'soapbox/features/ui/util/async-components'; export default @connect() class AttachmentThumbs extends ImmutablePureComponent { diff --git a/app/soapbox/components/autosuggest_account_input.js b/app/soapbox/components/autosuggest_account_input.js index 90cb91231..6a002fe24 100644 --- a/app/soapbox/components/autosuggest_account_input.js +++ b/app/soapbox/components/autosuggest_account_input.js @@ -1,10 +1,10 @@ -import React from 'react'; -import PropTypes from 'prop-types'; import { CancelToken } from 'axios'; -import ImmutablePureComponent from 'react-immutable-pure-component'; -import { connect } from 'react-redux'; import { OrderedSet as ImmutableOrderedSet } from 'immutable'; import { throttle } from 'lodash'; +import PropTypes from 'prop-types'; +import React from 'react'; +import ImmutablePureComponent from 'react-immutable-pure-component'; +import { connect } from 'react-redux'; import { accountSearch } from 'soapbox/actions/accounts'; import AutosuggestInput from './autosuggest_input'; diff --git a/app/soapbox/components/autosuggest_emoji.js b/app/soapbox/components/autosuggest_emoji.js index a8813c657..bf45d23a0 100644 --- a/app/soapbox/components/autosuggest_emoji.js +++ b/app/soapbox/components/autosuggest_emoji.js @@ -1,5 +1,5 @@ -import React from 'react'; import PropTypes from 'prop-types'; +import React from 'react'; import { joinPublicPath } from 'soapbox/utils/static'; import unicodeMapping from '../features/emoji/emoji_unicode_mapping_light'; diff --git a/app/soapbox/components/autosuggest_input.js b/app/soapbox/components/autosuggest_input.js index 619aabce2..84df2b6f7 100644 --- a/app/soapbox/components/autosuggest_input.js +++ b/app/soapbox/components/autosuggest_input.js @@ -1,12 +1,12 @@ -import React from 'react'; -import ImmutablePropTypes from 'react-immutable-proptypes'; -import PropTypes from 'prop-types'; -import ImmutablePureComponent from 'react-immutable-pure-component'; import classNames from 'classnames'; import { List as ImmutableList } from 'immutable'; +import PropTypes from 'prop-types'; +import React from 'react'; +import ImmutablePropTypes from 'react-immutable-proptypes'; +import ImmutablePureComponent from 'react-immutable-pure-component'; import Icon from 'soapbox/components/icon'; -import { isRtl } from '../rtl'; import AutosuggestAccountContainer from '../features/compose/containers/autosuggest_account_container'; +import { isRtl } from '../rtl'; import AutosuggestEmoji from './autosuggest_emoji'; const textAtCursorMatchesToken = (str, caretPosition, searchTokens) => { diff --git a/app/soapbox/components/autosuggest_textarea.js b/app/soapbox/components/autosuggest_textarea.js index 032479475..b115ad942 100644 --- a/app/soapbox/components/autosuggest_textarea.js +++ b/app/soapbox/components/autosuggest_textarea.js @@ -1,11 +1,11 @@ +import classNames from 'classnames'; +import PropTypes from 'prop-types'; import React from 'react'; import ImmutablePropTypes from 'react-immutable-proptypes'; -import PropTypes from 'prop-types'; import ImmutablePureComponent from 'react-immutable-pure-component'; import Textarea from 'react-textarea-autosize'; -import classNames from 'classnames'; -import { isRtl } from '../rtl'; import AutosuggestAccountContainer from '../features/compose/containers/autosuggest_account_container'; +import { isRtl } from '../rtl'; import AutosuggestEmoji from './autosuggest_emoji'; const textAtCursorMatchesToken = (str, caretPosition) => { diff --git a/app/soapbox/components/avatar.js b/app/soapbox/components/avatar.js index e909c44df..b3349928d 100644 --- a/app/soapbox/components/avatar.js +++ b/app/soapbox/components/avatar.js @@ -1,7 +1,7 @@ -import React from 'react'; -import PropTypes from 'prop-types'; -import ImmutablePropTypes from 'react-immutable-proptypes'; import classNames from 'classnames'; +import PropTypes from 'prop-types'; +import React from 'react'; +import ImmutablePropTypes from 'react-immutable-proptypes'; import StillImage from 'soapbox/components/still_image'; export default class Avatar extends React.PureComponent { diff --git a/app/soapbox/components/avatar_composite.js b/app/soapbox/components/avatar_composite.js index c6d1eb8cc..d0f93533a 100644 --- a/app/soapbox/components/avatar_composite.js +++ b/app/soapbox/components/avatar_composite.js @@ -1,5 +1,5 @@ -import React from 'react'; import PropTypes from 'prop-types'; +import React from 'react'; import ImmutablePropTypes from 'react-immutable-proptypes'; import StillImage from 'soapbox/components/still_image'; diff --git a/app/soapbox/components/badge.js b/app/soapbox/components/badge.js index f38200d79..6185af97a 100644 --- a/app/soapbox/components/badge.js +++ b/app/soapbox/components/badge.js @@ -1,5 +1,5 @@ -import React from 'react'; import PropTypes from 'prop-types'; +import React from 'react'; const Badge = (props) => ( {props.title} diff --git a/app/soapbox/components/blurhash.js b/app/soapbox/components/blurhash.js index 0ad74277f..a8f61f066 100644 --- a/app/soapbox/components/blurhash.js +++ b/app/soapbox/components/blurhash.js @@ -1,8 +1,8 @@ // @ts-check import { decode } from 'blurhash'; -import React, { useRef, useEffect } from 'react'; import PropTypes from 'prop-types'; +import React, { useRef, useEffect } from 'react'; /** * @typedef BlurhashPropsBase diff --git a/app/soapbox/components/button.js b/app/soapbox/components/button.js index 87007d17d..7f69d6feb 100644 --- a/app/soapbox/components/button.js +++ b/app/soapbox/components/button.js @@ -1,6 +1,6 @@ -import React from 'react'; -import PropTypes from 'prop-types'; import classNames from 'classnames'; +import PropTypes from 'prop-types'; +import React from 'react'; import { Link } from 'react-router-dom'; import Icon from './icon'; diff --git a/app/soapbox/components/column.js b/app/soapbox/components/column.js index 1b5fabb05..36a262ddd 100644 --- a/app/soapbox/components/column.js +++ b/app/soapbox/components/column.js @@ -1,6 +1,6 @@ -import React from 'react'; -import PropTypes from 'prop-types'; import classNames from 'classnames'; +import PropTypes from 'prop-types'; +import React from 'react'; export default class Column extends React.PureComponent { diff --git a/app/soapbox/components/column_back_button.js b/app/soapbox/components/column_back_button.js index 54b700b63..5c901f4be 100644 --- a/app/soapbox/components/column_back_button.js +++ b/app/soapbox/components/column_back_button.js @@ -1,6 +1,6 @@ +import PropTypes from 'prop-types'; import React from 'react'; import { FormattedMessage } from 'react-intl'; -import PropTypes from 'prop-types'; import Icon from 'soapbox/components/icon'; export default class ColumnBackButton extends React.PureComponent { diff --git a/app/soapbox/components/column_header.js b/app/soapbox/components/column_header.js index b3fa00d59..5fd4c09ba 100644 --- a/app/soapbox/components/column_header.js +++ b/app/soapbox/components/column_header.js @@ -1,7 +1,7 @@ 'use strict'; -import React from 'react'; import PropTypes from 'prop-types'; +import React from 'react'; // import classNames from 'classnames'; // import { injectIntl, defineMessages } from 'react-intl'; // import Icon from 'soapbox/components/icon'; diff --git a/app/soapbox/components/display_name.js b/app/soapbox/components/display_name.js index 1fa642405..7b0103cfe 100644 --- a/app/soapbox/components/display_name.js +++ b/app/soapbox/components/display_name.js @@ -1,14 +1,14 @@ -import React from 'react'; import PropTypes from 'prop-types'; -import { connect } from 'react-redux'; +import React from 'react'; import ImmutablePropTypes from 'react-immutable-proptypes'; +import { connect } from 'react-redux'; import HoverRefWrapper from 'soapbox/components/hover_ref_wrapper'; -import { displayFqn } from 'soapbox/utils/state'; import { isVerified } from 'soapbox/utils/accounts'; +import { displayFqn } from 'soapbox/utils/state'; import { getAcct } from '../utils/accounts'; -import VerificationBadge from './verification_badge'; import Icon from './icon'; import RelativeTimestamp from './relative_timestamp'; +import VerificationBadge from './verification_badge'; const mapStateToProps = state => { return { diff --git a/app/soapbox/components/domain.js b/app/soapbox/components/domain.js index 3d12bfba9..d9e067bc2 100644 --- a/app/soapbox/components/domain.js +++ b/app/soapbox/components/domain.js @@ -1,7 +1,7 @@ -import React from 'react'; import PropTypes from 'prop-types'; -import { defineMessages, injectIntl } from 'react-intl'; +import React from 'react'; import ImmutablePureComponent from 'react-immutable-pure-component'; +import { defineMessages, injectIntl } from 'react-intl'; import IconButton from './icon_button'; const messages = defineMessages({ diff --git a/app/soapbox/components/dropdown_menu.js b/app/soapbox/components/dropdown_menu.js index 230509236..f3235815e 100644 --- a/app/soapbox/components/dropdown_menu.js +++ b/app/soapbox/components/dropdown_menu.js @@ -1,10 +1,10 @@ -import React from 'react'; import classNames from 'classnames'; -import PropTypes from 'prop-types'; -import ImmutablePropTypes from 'react-immutable-proptypes'; -import Overlay from 'react-overlays/lib/Overlay'; -import spring from 'react-motion/lib/spring'; import { supportsPassiveEvents } from 'detect-passive-events'; +import PropTypes from 'prop-types'; +import React from 'react'; +import ImmutablePropTypes from 'react-immutable-proptypes'; +import spring from 'react-motion/lib/spring'; +import Overlay from 'react-overlays/lib/Overlay'; import Icon from 'soapbox/components/icon'; import Motion from '../features/ui/util/optional_motion'; import IconButton from './icon_button'; diff --git a/app/soapbox/components/emoji_selector.js b/app/soapbox/components/emoji_selector.js index 57898f299..c0c0d1671 100644 --- a/app/soapbox/components/emoji_selector.js +++ b/app/soapbox/components/emoji_selector.js @@ -1,11 +1,11 @@ -import React from 'react'; +import classNames from 'classnames'; import PropTypes from 'prop-types'; +import React from 'react'; import { HotKeys } from 'react-hotkeys'; import ImmutablePureComponent from 'react-immutable-pure-component'; import { connect } from 'react-redux'; -import classNames from 'classnames'; -import emojify from 'soapbox/features/emoji/emoji'; import { getSoapboxConfig } from 'soapbox/actions/soapbox'; +import emojify from 'soapbox/features/emoji/emoji'; const mapStateToProps = state => ({ allowedEmoji: getSoapboxConfig(state).get('allowedEmoji'), diff --git a/app/soapbox/components/error_boundary.js b/app/soapbox/components/error_boundary.js index c2043b7b3..1fe31ac84 100644 --- a/app/soapbox/components/error_boundary.js +++ b/app/soapbox/components/error_boundary.js @@ -1,8 +1,8 @@ -import React from 'react'; import PropTypes from 'prop-types'; +import React from 'react'; import { FormattedMessage } from 'react-intl'; -import { captureException } from 'soapbox/monitoring'; import Icon from 'soapbox/components/icon'; +import { captureException } from 'soapbox/monitoring'; export default class ErrorBoundary extends React.PureComponent { diff --git a/app/soapbox/components/extended_video_player.js b/app/soapbox/components/extended_video_player.js index c0553283c..c86eee5db 100644 --- a/app/soapbox/components/extended_video_player.js +++ b/app/soapbox/components/extended_video_player.js @@ -1,5 +1,5 @@ -import React from 'react'; import PropTypes from 'prop-types'; +import React from 'react'; import { isIOS } from 'soapbox/is_mobile'; export default class ExtendedVideoPlayer extends React.PureComponent { diff --git a/app/soapbox/components/filter_bar.js b/app/soapbox/components/filter_bar.js index cb00014a0..172bbf420 100644 --- a/app/soapbox/components/filter_bar.js +++ b/app/soapbox/components/filter_bar.js @@ -1,7 +1,7 @@ -import React from 'react'; import classNames from 'classnames'; -import PropTypes from 'prop-types'; import { debounce } from 'lodash'; +import PropTypes from 'prop-types'; +import React from 'react'; export default class FilterBar extends React.PureComponent { diff --git a/app/soapbox/components/fork_awesome_icon.js b/app/soapbox/components/fork_awesome_icon.js index adca2cbd6..1d85f1288 100644 --- a/app/soapbox/components/fork_awesome_icon.js +++ b/app/soapbox/components/fork_awesome_icon.js @@ -5,9 +5,9 @@ * @see soapbox/components/icon */ -import React from 'react'; -import PropTypes from 'prop-types'; import classNames from 'classnames'; +import PropTypes from 'prop-types'; +import React from 'react'; export default class ForkAwesomeIcon extends React.PureComponent { diff --git a/app/soapbox/components/hashtag.js b/app/soapbox/components/hashtag.js index 0b9f64a92..e6304dc22 100644 --- a/app/soapbox/components/hashtag.js +++ b/app/soapbox/components/hashtag.js @@ -1,7 +1,7 @@ import React from 'react'; -import { Sparklines, SparklinesCurve } from 'react-sparklines'; -import { FormattedMessage } from 'react-intl'; import ImmutablePropTypes from 'react-immutable-proptypes'; +import { FormattedMessage } from 'react-intl'; +import { Sparklines, SparklinesCurve } from 'react-sparklines'; import { shortNumberFormat } from '../utils/numbers'; import Permalink from './permalink'; diff --git a/app/soapbox/components/helmet.js b/app/soapbox/components/helmet.js index 3b96b8c10..1d6ce0394 100644 --- a/app/soapbox/components/helmet.js +++ b/app/soapbox/components/helmet.js @@ -1,8 +1,8 @@ -import React from 'react'; -import { connect } from 'react-redux'; import PropTypes from 'prop-types'; -import { withRouter } from 'react-router-dom'; +import React from 'react'; import { Helmet } from'react-helmet'; +import { connect } from 'react-redux'; +import { withRouter } from 'react-router-dom'; import { getSettings } from 'soapbox/actions/settings'; import sourceCode from 'soapbox/utils/code'; import FaviconService from 'soapbox/utils/favicon_service'; diff --git a/app/soapbox/components/hover_ref_wrapper.js b/app/soapbox/components/hover_ref_wrapper.js index a3d6cb2a2..910a09f2f 100644 --- a/app/soapbox/components/hover_ref_wrapper.js +++ b/app/soapbox/components/hover_ref_wrapper.js @@ -1,7 +1,7 @@ -import React, { useRef } from 'react'; -import PropTypes from 'prop-types'; -import { useDispatch } from 'react-redux'; import { debounce } from 'lodash'; +import PropTypes from 'prop-types'; +import React, { useRef } from 'react'; +import { useDispatch } from 'react-redux'; import { openProfileHoverCard, closeProfileHoverCard, diff --git a/app/soapbox/components/icon.js b/app/soapbox/components/icon.js index 9c0ec0d2c..2f00d1ef7 100644 --- a/app/soapbox/components/icon.js +++ b/app/soapbox/components/icon.js @@ -5,8 +5,8 @@ * @see soapbox/components/svg_icon */ -import React from 'react'; import PropTypes from 'prop-types'; +import React from 'react'; import ForkAwesomeIcon from './fork_awesome_icon'; import SvgIcon from './svg_icon'; diff --git a/app/soapbox/components/icon_button.js b/app/soapbox/components/icon_button.js index 431f72507..0e4d99031 100644 --- a/app/soapbox/components/icon_button.js +++ b/app/soapbox/components/icon_button.js @@ -1,7 +1,7 @@ +import classNames from 'classnames'; +import PropTypes from 'prop-types'; import React from 'react'; import spring from 'react-motion/lib/spring'; -import PropTypes from 'prop-types'; -import classNames from 'classnames'; import Icon from 'soapbox/components/icon'; import emojify from 'soapbox/features/emoji/emoji'; import Motion from '../features/ui/util/optional_motion'; diff --git a/app/soapbox/components/icon_with_counter.js b/app/soapbox/components/icon_with_counter.js index 3a8f1b64e..d789dc2fc 100644 --- a/app/soapbox/components/icon_with_counter.js +++ b/app/soapbox/components/icon_with_counter.js @@ -1,5 +1,5 @@ -import React from 'react'; import PropTypes from 'prop-types'; +import React from 'react'; import Icon from 'soapbox/components/icon'; import { shortNumberFormat } from 'soapbox/utils/numbers'; diff --git a/app/soapbox/components/intersection_observer_article.js b/app/soapbox/components/intersection_observer_article.js index 96ac6188a..64097399a 100644 --- a/app/soapbox/components/intersection_observer_article.js +++ b/app/soapbox/components/intersection_observer_article.js @@ -1,8 +1,8 @@ -import React from 'react'; -import PropTypes from 'prop-types'; import { is } from 'immutable'; -import scheduleIdleTask from '../features/ui/util/schedule_idle_task'; +import PropTypes from 'prop-types'; +import React from 'react'; import getRectFromEntry from '../features/ui/util/get_rect_from_entry'; +import scheduleIdleTask from '../features/ui/util/schedule_idle_task'; // Diff these props in the "rendered" state const updateOnPropsForRendered = ['id', 'index', 'listLength']; diff --git a/app/soapbox/components/load_gap.js b/app/soapbox/components/load_gap.js index 3381b61bd..1c4ca83cc 100644 --- a/app/soapbox/components/load_gap.js +++ b/app/soapbox/components/load_gap.js @@ -1,5 +1,5 @@ -import React from 'react'; import PropTypes from 'prop-types'; +import React from 'react'; import { injectIntl, defineMessages } from 'react-intl'; import Icon from 'soapbox/components/icon'; diff --git a/app/soapbox/components/load_more.js b/app/soapbox/components/load_more.js index 389c3e1e1..0efe991e7 100644 --- a/app/soapbox/components/load_more.js +++ b/app/soapbox/components/load_more.js @@ -1,6 +1,6 @@ +import PropTypes from 'prop-types'; import React from 'react'; import { FormattedMessage } from 'react-intl'; -import PropTypes from 'prop-types'; export default class LoadMore extends React.PureComponent { diff --git a/app/soapbox/components/loading_spinner.js b/app/soapbox/components/loading_spinner.js index a632454db..4f2944b3f 100644 --- a/app/soapbox/components/loading_spinner.js +++ b/app/soapbox/components/loading_spinner.js @@ -2,8 +2,8 @@ * iOS style loading spinner. * It's mostly CSS, adapted from: https://loading.io/css/ */ -import React from 'react'; import PropTypes from 'prop-types'; +import React from 'react'; const LoadingSpinner = ({ size = 30 }) => (