From 0ddf6f2768d17a6f2663f05f5e3183d49c42f827 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?marcin=20miko=C5=82ajczak?= Date: Wed, 28 Aug 2024 14:48:35 +0200 Subject: [PATCH] pl-fe: lint MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: marcin mikołajczak --- packages/pl-fe/src/actions/about.ts | 2 +- packages/pl-fe/src/actions/account-notes.ts | 2 +- packages/pl-fe/src/actions/statuses.ts | 2 +- packages/pl-fe/src/components/status-content.tsx | 2 +- packages/pl-fe/src/components/status-list.tsx | 2 +- .../pl-fe/src/features/compose/components/search-results.tsx | 4 ++-- packages/pl-fe/src/features/notifications/index.tsx | 2 +- packages/pl-fe/src/features/status/components/thread.tsx | 2 +- packages/pl-fe/src/jest/test-helpers.tsx | 2 +- packages/pl-fe/src/middleware/sounds.ts | 2 +- packages/pl-fe/src/reducers/admin-user-index.ts | 2 +- packages/pl-fe/src/reducers/admin.ts | 2 +- packages/pl-fe/src/reducers/auth.ts | 2 +- packages/pl-fe/src/reducers/draft-statuses.ts | 2 +- packages/pl-fe/src/reducers/index.ts | 2 +- packages/pl-fe/src/reducers/me.ts | 2 +- packages/pl-fe/src/reducers/notifications.ts | 2 +- packages/pl-fe/src/reducers/pending-statuses.ts | 2 +- packages/pl-fe/src/reducers/relationships.ts | 2 +- packages/pl-fe/src/reducers/timelines.ts | 2 +- packages/pl-fe/src/utils/status.ts | 2 +- 21 files changed, 22 insertions(+), 22 deletions(-) diff --git a/packages/pl-fe/src/actions/about.ts b/packages/pl-fe/src/actions/about.ts index 2dfcf41c2..a1927d1da 100644 --- a/packages/pl-fe/src/actions/about.ts +++ b/packages/pl-fe/src/actions/about.ts @@ -1,7 +1,7 @@ import { staticFetch } from '../api'; -import type { AnyAction } from 'redux'; import type { RootState } from 'pl-fe/store'; +import type { AnyAction } from 'redux'; const FETCH_ABOUT_PAGE_REQUEST = 'FETCH_ABOUT_PAGE_REQUEST' as const; const FETCH_ABOUT_PAGE_SUCCESS = 'FETCH_ABOUT_PAGE_SUCCESS' as const; diff --git a/packages/pl-fe/src/actions/account-notes.ts b/packages/pl-fe/src/actions/account-notes.ts index 66f3d52b6..31159ee94 100644 --- a/packages/pl-fe/src/actions/account-notes.ts +++ b/packages/pl-fe/src/actions/account-notes.ts @@ -1,7 +1,7 @@ import { getClient } from '../api'; -import type { AnyAction } from 'redux'; import type { RootState } from 'pl-fe/store'; +import type { AnyAction } from 'redux'; const ACCOUNT_NOTE_SUBMIT_REQUEST = 'ACCOUNT_NOTE_SUBMIT_REQUEST' as const; const ACCOUNT_NOTE_SUBMIT_SUCCESS = 'ACCOUNT_NOTE_SUBMIT_SUCCESS' as const; diff --git a/packages/pl-fe/src/actions/statuses.ts b/packages/pl-fe/src/actions/statuses.ts index 70a2c314f..0e8f03ab9 100644 --- a/packages/pl-fe/src/actions/statuses.ts +++ b/packages/pl-fe/src/actions/statuses.ts @@ -10,10 +10,10 @@ import { getSettings } from './settings'; import { deleteFromTimelines } from './timelines'; import type { CreateStatusParams, Status as BaseStatus } from 'pl-api'; -import type { IntlShape } from 'react-intl'; import type { Status } from 'pl-fe/normalizers'; import type { AppDispatch, RootState } from 'pl-fe/store'; import type { APIEntity } from 'pl-fe/types/entities'; +import type { IntlShape } from 'react-intl'; const STATUS_CREATE_REQUEST = 'STATUS_CREATE_REQUEST' as const; const STATUS_CREATE_SUCCESS = 'STATUS_CREATE_SUCCESS' as const; diff --git a/packages/pl-fe/src/components/status-content.tsx b/packages/pl-fe/src/components/status-content.tsx index b471d50c5..9a0ad45f6 100644 --- a/packages/pl-fe/src/components/status-content.tsx +++ b/packages/pl-fe/src/components/status-content.tsx @@ -197,7 +197,7 @@ const StatusContent: React.FC = React.memo(({ theme='muted' size='xs' onClick={toggleExpanded} - icon={expanded ? require('@tabler/icons/outline/chevron-up.svg') : require('@tabler/icons/outline/chevron-down.svg')} + icon={expanded ? require('@tabler/icons/outline/chevron-up.svg') : require('@tabler/icons/outline/chevron-down.svg')} > {intl.formatMessage(expanded ? messages.collapse : messages.expand)} diff --git a/packages/pl-fe/src/components/status-list.tsx b/packages/pl-fe/src/components/status-list.tsx index 565acdae9..76f4095d5 100644 --- a/packages/pl-fe/src/components/status-list.tsx +++ b/packages/pl-fe/src/components/status-list.tsx @@ -14,8 +14,8 @@ import { usePlFeConfig } from 'pl-fe/hooks'; import { Stack, Text } from './ui'; import type { OrderedSet as ImmutableOrderedSet } from 'immutable'; -import type { VirtuosoHandle } from 'react-virtuoso'; import type { IScrollableList } from 'pl-fe/components/scrollable-list'; +import type { VirtuosoHandle } from 'react-virtuoso'; interface IStatusList extends Omit { /** Unique key to preserve the scroll position when navigating back. */ diff --git a/packages/pl-fe/src/features/compose/components/search-results.tsx b/packages/pl-fe/src/features/compose/components/search-results.tsx index 5005d7a24..164e8e387 100644 --- a/packages/pl-fe/src/features/compose/components/search-results.tsx +++ b/packages/pl-fe/src/features/compose/components/search-results.tsx @@ -18,8 +18,8 @@ import PlaceholderHashtag from 'pl-fe/features/placeholder/components/placeholde import PlaceholderStatus from 'pl-fe/features/placeholder/components/placeholder-status'; import { useAppDispatch, useAppSelector, useFeatures } from 'pl-fe/hooks'; -import type { VirtuosoHandle } from 'react-virtuoso'; import type { SearchFilter } from 'pl-fe/reducers/search'; +import type { VirtuosoHandle } from 'react-virtuoso'; const messages = defineMessages({ accounts: { id: 'search_results.accounts', defaultMessage: 'People' }, @@ -216,7 +216,7 @@ const SearchResults = () => { searchResults = ImmutableList(trendingLinks.map(trendingLink => )); } } - + return ( <> {filterByAccount ? ( diff --git a/packages/pl-fe/src/features/notifications/index.tsx b/packages/pl-fe/src/features/notifications/index.tsx index caef17165..65ffe0c3f 100644 --- a/packages/pl-fe/src/features/notifications/index.tsx +++ b/packages/pl-fe/src/features/notifications/index.tsx @@ -20,8 +20,8 @@ import { useAppDispatch, useAppSelector, useSettings } from 'pl-fe/hooks'; import FilterBar from './components/filter-bar'; import Notification from './components/notification'; -import type { VirtuosoHandle } from 'react-virtuoso'; import type { RootState } from 'pl-fe/store'; +import type { VirtuosoHandle } from 'react-virtuoso'; const messages = defineMessages({ title: { id: 'column.notifications', defaultMessage: 'Notifications' }, diff --git a/packages/pl-fe/src/features/status/components/thread.tsx b/packages/pl-fe/src/features/status/components/thread.tsx index 51c7cb43d..9b8895a0e 100644 --- a/packages/pl-fe/src/features/status/components/thread.tsx +++ b/packages/pl-fe/src/features/status/components/thread.tsx @@ -24,9 +24,9 @@ import { textForScreenReader } from 'pl-fe/utils/status'; import DetailedStatus from './detailed-status'; import ThreadStatus from './thread-status'; -import type { VirtuosoHandle } from 'react-virtuoso'; import type { Account, Status } from 'pl-fe/normalizers'; import type { SelectedStatus } from 'pl-fe/selectors'; +import type { VirtuosoHandle } from 'react-virtuoso'; const getAncestorsIds = createSelector([ (_: RootState, statusId: string | undefined) => statusId, diff --git a/packages/pl-fe/src/jest/test-helpers.tsx b/packages/pl-fe/src/jest/test-helpers.tsx index 77927baf6..8cefb7917 100644 --- a/packages/pl-fe/src/jest/test-helpers.tsx +++ b/packages/pl-fe/src/jest/test-helpers.tsx @@ -17,8 +17,8 @@ import { queryClient } from 'pl-fe/queries/client'; import { default as rootReducer } from '../reducers'; -import type { AnyAction } from 'redux'; import type { AppDispatch } from 'pl-fe/store'; +import type { AnyAction } from 'redux'; // Mock Redux // https://redux.js.org/recipes/writing-tests/ diff --git a/packages/pl-fe/src/middleware/sounds.ts b/packages/pl-fe/src/middleware/sounds.ts index fa34a0d56..57c3534ec 100644 --- a/packages/pl-fe/src/middleware/sounds.ts +++ b/packages/pl-fe/src/middleware/sounds.ts @@ -1,8 +1,8 @@ import { play, soundCache } from 'pl-fe/utils/sounds'; -import type { AnyAction, Middleware } from 'redux'; import type { Sounds } from 'pl-fe/utils/sounds'; +import type { AnyAction, Middleware } from 'redux'; interface Action extends AnyAction { meta: { diff --git a/packages/pl-fe/src/reducers/admin-user-index.ts b/packages/pl-fe/src/reducers/admin-user-index.ts index 144cdfafa..f44709842 100644 --- a/packages/pl-fe/src/reducers/admin-user-index.ts +++ b/packages/pl-fe/src/reducers/admin-user-index.ts @@ -11,8 +11,8 @@ import { } from 'pl-fe/actions/admin'; import type { AdminAccount, AdminGetAccountsParams, PaginatedResponse } from 'pl-api'; -import type { AnyAction } from 'redux'; import type { APIEntity } from 'pl-fe/types/entities'; +import type { AnyAction } from 'redux'; const ReducerRecord = ImmutableRecord({ isLoading: false, diff --git a/packages/pl-fe/src/reducers/admin.ts b/packages/pl-fe/src/reducers/admin.ts index 7b392153d..0767ffbe8 100644 --- a/packages/pl-fe/src/reducers/admin.ts +++ b/packages/pl-fe/src/reducers/admin.ts @@ -22,8 +22,8 @@ import { import { normalizeAdminReport, type AdminReport } from 'pl-fe/normalizers'; import type { AdminAccount, AdminGetAccountsParams, AdminReport as BaseAdminReport } from 'pl-api'; -import type { AnyAction } from 'redux'; import type { Config } from 'pl-fe/utils/config-db'; +import type { AnyAction } from 'redux'; const ReducerRecord = ImmutableRecord({ reports: ImmutableMap(), diff --git a/packages/pl-fe/src/reducers/auth.ts b/packages/pl-fe/src/reducers/auth.ts index 84f16423d..067909563 100644 --- a/packages/pl-fe/src/reducers/auth.ts +++ b/packages/pl-fe/src/reducers/auth.ts @@ -18,9 +18,9 @@ import { } from '../actions/auth'; import { ME_FETCH_SKIP } from '../actions/me'; -import type { AnyAction } from 'redux'; import type { PlfeResponse } from 'pl-fe/api'; import type { Account as AccountEntity } from 'pl-fe/normalizers'; +import type { AnyAction } from 'redux'; const backendUrl = (isURL(BuildConfig.BACKEND_URL) ? BuildConfig.BACKEND_URL : ''); diff --git a/packages/pl-fe/src/reducers/draft-statuses.ts b/packages/pl-fe/src/reducers/draft-statuses.ts index f4c12a050..76fd87b90 100644 --- a/packages/pl-fe/src/reducers/draft-statuses.ts +++ b/packages/pl-fe/src/reducers/draft-statuses.ts @@ -5,9 +5,9 @@ import { DRAFT_STATUSES_FETCH_SUCCESS, PERSIST_DRAFT_STATUS, CANCEL_DRAFT_STATUS import KVStore from 'pl-fe/storage/kv-store'; import type { MediaAttachment } from 'pl-api'; -import type { AnyAction } from 'redux'; import type { StatusVisibility } from 'pl-fe/normalizers/status'; import type { APIEntity } from 'pl-fe/types/entities'; +import type { AnyAction } from 'redux'; const DraftStatusRecord = ImmutableRecord({ content_type: 'text/plain', diff --git a/packages/pl-fe/src/reducers/index.ts b/packages/pl-fe/src/reducers/index.ts index 7d5f50dfe..ffa6f6dcc 100644 --- a/packages/pl-fe/src/reducers/index.ts +++ b/packages/pl-fe/src/reducers/index.ts @@ -34,6 +34,7 @@ import mutes from './mutes'; import notifications from './notifications'; import onboarding from './onboarding'; import pending_statuses from './pending-statuses'; +import plfe from './pl-fe'; import polls from './polls'; import profile_hover_card from './profile-hover-card'; import push_notifications from './push-notifications'; @@ -44,7 +45,6 @@ import search from './search'; import security from './security'; import settings from './settings'; import sidebar from './sidebar'; -import plfe from './pl-fe'; import status_hover_card from './status-hover-card'; import status_lists from './status-lists'; import statuses from './statuses'; diff --git a/packages/pl-fe/src/reducers/me.ts b/packages/pl-fe/src/reducers/me.ts index c1b35ec7a..cbf69e8aa 100644 --- a/packages/pl-fe/src/reducers/me.ts +++ b/packages/pl-fe/src/reducers/me.ts @@ -10,9 +10,9 @@ import { ME_PATCH_SUCCESS, } from '../actions/me'; -import type { AnyAction } from 'redux'; import type { PlfeResponse } from 'pl-fe/api'; import type { Me } from 'pl-fe/types/pl-fe'; +import type { AnyAction } from 'redux'; const initialState: Me = null; diff --git a/packages/pl-fe/src/reducers/notifications.ts b/packages/pl-fe/src/reducers/notifications.ts index 90342f2a9..80eb0b587 100644 --- a/packages/pl-fe/src/reducers/notifications.ts +++ b/packages/pl-fe/src/reducers/notifications.ts @@ -28,8 +28,8 @@ import { import { TIMELINE_DELETE } from '../actions/timelines'; import type { AccountWarning, Notification as BaseNotification, Markers, PaginatedResponse, Relationship, RelationshipSeveranceEvent, Report } from 'pl-api'; -import type { AnyAction } from 'redux'; import type { Notification } from 'pl-fe/normalizers'; +import type { AnyAction } from 'redux'; const QueuedNotificationRecord = ImmutableRecord({ notification: {} as any as BaseNotification, diff --git a/packages/pl-fe/src/reducers/pending-statuses.ts b/packages/pl-fe/src/reducers/pending-statuses.ts index 9add7c3e9..44eeb7a8d 100644 --- a/packages/pl-fe/src/reducers/pending-statuses.ts +++ b/packages/pl-fe/src/reducers/pending-statuses.ts @@ -6,8 +6,8 @@ import { STATUS_CREATE_SUCCESS, } from 'pl-fe/actions/statuses'; -import type { AnyAction } from 'redux'; import type { StatusVisibility } from 'pl-fe/normalizers/status'; +import type { AnyAction } from 'redux'; const PendingStatusRecord = ImmutableRecord({ content_type: '', diff --git a/packages/pl-fe/src/reducers/relationships.ts b/packages/pl-fe/src/reducers/relationships.ts index 4361e37b5..9161b0bb2 100644 --- a/packages/pl-fe/src/reducers/relationships.ts +++ b/packages/pl-fe/src/reducers/relationships.ts @@ -16,8 +16,8 @@ import { import { DOMAIN_BLOCK_SUCCESS, DOMAIN_UNBLOCK_SUCCESS } from '../actions/domain-blocks'; import { ACCOUNT_IMPORT, ACCOUNTS_IMPORT } from '../actions/importer'; -import type { AnyAction } from 'redux'; import type { APIEntity } from 'pl-fe/types/entities'; +import type { AnyAction } from 'redux'; type State = ImmutableMap; type APIEntities = Array; diff --git a/packages/pl-fe/src/reducers/timelines.ts b/packages/pl-fe/src/reducers/timelines.ts index 339ea7b22..86360e2dc 100644 --- a/packages/pl-fe/src/reducers/timelines.ts +++ b/packages/pl-fe/src/reducers/timelines.ts @@ -25,8 +25,8 @@ import { import type { Status } from '../normalizers'; import type { PaginatedResponse, Status as BaseStatus, Relationship } from 'pl-api'; -import type { AnyAction } from 'redux'; import type { ImportPosition } from 'pl-fe/entity-store/types'; +import type { AnyAction } from 'redux'; const TRUNCATE_LIMIT = 40; const TRUNCATE_SIZE = 20; diff --git a/packages/pl-fe/src/utils/status.ts b/packages/pl-fe/src/utils/status.ts index 4c53bb16f..c0f62f63b 100644 --- a/packages/pl-fe/src/utils/status.ts +++ b/packages/pl-fe/src/utils/status.ts @@ -1,7 +1,7 @@ import { isIntegerId } from 'pl-fe/utils/numbers'; -import type { IntlShape } from 'react-intl'; import type { Status } from 'pl-fe/normalizers'; +import type { IntlShape } from 'react-intl'; /** Get the initial visibility of media attachments from user settings. */ const defaultMediaVisibility = (