diff --git a/packages/pl-fe/src/actions/accounts.ts b/packages/pl-fe/src/actions/accounts.ts index b61c99583..a6a867494 100644 --- a/packages/pl-fe/src/actions/accounts.ts +++ b/packages/pl-fe/src/actions/accounts.ts @@ -1,4 +1,4 @@ -import { getClient } from '../api'; +import { getClient } from '@/api'; import type { NormalizedStatus } from '@/reducers/statuses'; import type { AppDispatch, RootState } from '@/store'; diff --git a/packages/pl-fe/src/actions/admin.ts b/packages/pl-fe/src/actions/admin.ts index 7ec55358d..16d27fc12 100644 --- a/packages/pl-fe/src/actions/admin.ts +++ b/packages/pl-fe/src/actions/admin.ts @@ -1,12 +1,11 @@ import { importEntities } from '@/actions/importer'; +import { getClient } from '@/api'; import { queryClient } from '@/queries/client'; import { queryKeys } from '@/queries/keys'; import { useComposeStore } from '@/stores/compose'; import { useModalsStore } from '@/stores/modals'; import { filterBadges, getTagDiff } from '@/utils/badges'; -import { getClient } from '../api'; - import { STATUS_FETCH_SOURCE_FAIL, type StatusesAction } from './statuses'; import { deleteFromTimelines } from './timelines'; diff --git a/packages/pl-fe/src/actions/auth.ts b/packages/pl-fe/src/actions/auth.ts index 53a267f60..6929b82f7 100644 --- a/packages/pl-fe/src/actions/auth.ts +++ b/packages/pl-fe/src/actions/auth.ts @@ -22,6 +22,7 @@ import { createAccount } from '@/actions/accounts'; import { createApp } from '@/actions/apps'; import { fetchMeSuccess, fetchMeFail } from '@/actions/me'; import { obtainOAuthToken, revokeOAuthToken } from '@/actions/oauth'; +import { type PlfeResponse, getClient } from '@/api'; import * as BuildConfig from '@/build-config'; import { selectAccount } from '@/queries/accounts/selectors'; import { queryClient } from '@/queries/client'; @@ -35,8 +36,6 @@ import { normalizeUsername } from '@/utils/input'; import { getScopes } from '@/utils/scopes'; import { isStandalone } from '@/utils/state'; -import { type PlfeResponse, getClient } from '../api'; - import type { AppDispatch, RootState } from '@/store'; const SWITCH_ACCOUNT = 'SWITCH_ACCOUNT' as const; diff --git a/packages/pl-fe/src/actions/emoji-reacts.ts b/packages/pl-fe/src/actions/emoji-reacts.ts index 3806ea0a9..d2aa07456 100644 --- a/packages/pl-fe/src/actions/emoji-reacts.ts +++ b/packages/pl-fe/src/actions/emoji-reacts.ts @@ -1,12 +1,11 @@ import { defineMessages, type IntlShape } from 'react-intl'; +import { getClient } from '@/api'; import { useSettingsStore } from '@/stores/settings'; import toast from '@/toast'; import { isLoggedIn } from '@/utils/auth'; import { supportsEmojiReacts } from '@/utils/check-instance-capability'; -import { getClient } from '../api'; - import { importEntities } from './importer'; import type { AppDispatch, RootState } from '@/store'; diff --git a/packages/pl-fe/src/actions/frontend-config.ts b/packages/pl-fe/src/actions/frontend-config.ts index 3097924c3..c2f19e54e 100644 --- a/packages/pl-fe/src/actions/frontend-config.ts +++ b/packages/pl-fe/src/actions/frontend-config.ts @@ -2,12 +2,11 @@ import { createSelector } from 'reselect'; import * as v from 'valibot'; import { getHost } from '@/actions/instance'; +import { getClient, staticFetch } from '@/api'; import { frontendConfigSchema } from '@/schemas/frontend-config'; import KVStore from '@/storage/kv-store'; import { useSettingsStore } from '@/stores/settings'; -import { getClient, staticFetch } from '../api'; - import type { AppDispatch, RootState } from '@/store'; import type { APIEntity } from '@/types/entities'; diff --git a/packages/pl-fe/src/actions/instance.ts b/packages/pl-fe/src/actions/instance.ts index e90e4ba17..8d1fc7abd 100644 --- a/packages/pl-fe/src/actions/instance.ts +++ b/packages/pl-fe/src/actions/instance.ts @@ -1,8 +1,7 @@ +import { getClient, staticFetch } from '@/api'; import { useComposeStore } from '@/stores/compose'; import { getAuthUserUrl, getMeUrl } from '@/utils/auth'; -import { getClient, staticFetch } from '../api'; - import type { AppDispatch, RootState } from '@/store'; import type { Instance } from 'pl-api'; diff --git a/packages/pl-fe/src/actions/me.ts b/packages/pl-fe/src/actions/me.ts index c3881e972..ab0dd2299 100644 --- a/packages/pl-fe/src/actions/me.ts +++ b/packages/pl-fe/src/actions/me.ts @@ -1,3 +1,4 @@ +import { getClient } from '@/api'; import { selectAccount } from '@/queries/accounts/selectors'; import { queryClient } from '@/queries/client'; import { queryKeys } from '@/queries/keys'; @@ -7,8 +8,6 @@ import { useComposeStore } from '@/stores/compose'; import { useSettingsStore } from '@/stores/settings'; import { getAuthUserId, getAuthUserUrl } from '@/utils/auth'; -import { getClient } from '../api'; - import { loadCredentials } from './auth'; import { FE_NAME } from './settings'; diff --git a/packages/pl-fe/src/actions/media.ts b/packages/pl-fe/src/actions/media.ts index 1ce3c537c..c3561b21b 100644 --- a/packages/pl-fe/src/actions/media.ts +++ b/packages/pl-fe/src/actions/media.ts @@ -1,13 +1,12 @@ import { defineMessages, type IntlShape } from 'react-intl'; +import { getClient } from '@/api'; import { useSettingsStore } from '@/stores/settings'; import toast from '@/toast'; import { isLoggedIn } from '@/utils/auth'; import { formatBytes, getVideoDuration } from '@/utils/media'; import resizeImage from '@/utils/resize-image'; -import { getClient } from '../api'; - import type { AppDispatch, RootState } from '@/store'; import type { MediaAttachment, UpdateMediaParams, UploadMediaParams } from 'pl-api'; diff --git a/packages/pl-fe/src/actions/push-subscriptions.ts b/packages/pl-fe/src/actions/push-subscriptions.ts index 0d4cba206..dccb3836d 100644 --- a/packages/pl-fe/src/actions/push-subscriptions.ts +++ b/packages/pl-fe/src/actions/push-subscriptions.ts @@ -1,4 +1,4 @@ -import { getClient } from '../api'; +import { getClient } from '@/api'; import type { AppDispatch, RootState } from '@/store'; import type { CreatePushNotificationsSubscriptionParams } from 'pl-api'; diff --git a/packages/pl-fe/src/actions/reports.ts b/packages/pl-fe/src/actions/reports.ts index bad4222f4..136ff9e0d 100644 --- a/packages/pl-fe/src/actions/reports.ts +++ b/packages/pl-fe/src/actions/reports.ts @@ -1,7 +1,6 @@ +import { getClient } from '@/api'; import { useModalsStore } from '@/stores/modals'; -import { getClient } from '../api'; - import type { NormalizedStatus as Status } from '@/reducers/statuses'; import type { AppDispatch, RootState } from '@/store'; import type { Account } from 'pl-api'; diff --git a/packages/pl-fe/src/actions/statuses.ts b/packages/pl-fe/src/actions/statuses.ts index 71392bcf4..70dd8d494 100644 --- a/packages/pl-fe/src/actions/statuses.ts +++ b/packages/pl-fe/src/actions/statuses.ts @@ -1,3 +1,4 @@ +import { getClient } from '@/api'; import { queryClient } from '@/queries/client'; import { queryKeys } from '@/queries/keys'; import { scheduledStatusesQueryOptions } from '@/queries/statuses/scheduled-statuses'; @@ -9,8 +10,6 @@ import { useSettingsStore } from '@/stores/settings'; import { isLoggedIn } from '@/utils/auth'; import { shouldHaveCard } from '@/utils/status'; -import { getClient } from '../api'; - import { importEntities } from './importer'; import { deleteFromTimelines } from './timelines'; diff --git a/packages/pl-fe/src/actions/timelines.ts b/packages/pl-fe/src/actions/timelines.ts index 67cbf06a1..351dad5e2 100644 --- a/packages/pl-fe/src/actions/timelines.ts +++ b/packages/pl-fe/src/actions/timelines.ts @@ -1,12 +1,11 @@ import { getLocale } from '@/actions/settings'; +import { getClient } from '@/api'; import { useComposeStore } from '@/stores/compose'; import { useContextStore } from '@/stores/contexts'; import { usePendingStatusesStore } from '@/stores/pending-statuses'; import { useSettingsStore } from '@/stores/settings'; import { shouldFilter } from '@/utils/timelines'; -import { getClient } from '../api'; - import { importEntities } from './importer'; import type { AppDispatch, RootState } from '@/store'; diff --git a/packages/pl-fe/src/components/hashtag.tsx b/packages/pl-fe/src/components/hashtag.tsx index 1c251f225..e182415cd 100644 --- a/packages/pl-fe/src/components/hashtag.tsx +++ b/packages/pl-fe/src/components/hashtag.tsx @@ -6,8 +6,7 @@ import { Sparklines, SparklinesCurve } from 'react-sparklines'; import HStack from '@/components/ui/hstack'; import Stack from '@/components/ui/stack'; import Text from '@/components/ui/text'; - -import { shortNumberFormat } from '../utils/numbers'; +import { shortNumberFormat } from '@/utils/numbers'; import type { Tag } from 'pl-api'; diff --git a/packages/pl-fe/src/init/nicolium.tsx b/packages/pl-fe/src/init/nicolium.tsx index 5772853d0..356ce7d63 100644 --- a/packages/pl-fe/src/init/nicolium.tsx +++ b/packages/pl-fe/src/init/nicolium.tsx @@ -3,12 +3,11 @@ import React from 'react'; import { HelmetProvider } from 'react-helmet-async'; import { Provider } from 'react-redux'; +import { preload } from '@/actions/preload'; import { DefaultCurrentAccountProvider } from '@/contexts/current-account-context'; import { StatProvider } from '@/contexts/stat-context'; import { queryClient } from '@/queries/client'; - -import { preload } from '../actions/preload'; -import { store } from '../store'; +import { store } from '@/store'; import NicoliumHead from './nicolium-head'; import NicoliumLoad from './nicolium-load'; diff --git a/packages/pl-fe/src/reducers/auth.ts b/packages/pl-fe/src/reducers/auth.ts index 6fff085c1..c36052d70 100644 --- a/packages/pl-fe/src/reducers/auth.ts +++ b/packages/pl-fe/src/reducers/auth.ts @@ -12,6 +12,17 @@ import { } from 'pl-api'; import * as v from 'valibot'; +import { + AUTH_APP_CREATED, + AUTH_LOGGED_IN, + AUTH_APP_AUTHORIZED, + AUTH_LOGGED_OUT, + SWITCH_ACCOUNT, + VERIFY_CREDENTIALS_SUCCESS, + VERIFY_CREDENTIALS_FAIL, + type AuthAction, +} from '@/actions/auth'; +import { ME_FETCH_SKIP, type MeAction } from '@/actions/me'; import { decodeFromMarkup, MASTODON_PRELOAD_IMPORT, @@ -23,18 +34,6 @@ import { coerceObject } from '@/schemas/utils'; import KVStore from '@/storage/kv-store'; import { validId, isURL, parseBaseURL } from '@/utils/auth'; -import { - AUTH_APP_CREATED, - AUTH_LOGGED_IN, - AUTH_APP_AUTHORIZED, - AUTH_LOGGED_OUT, - SWITCH_ACCOUNT, - VERIFY_CREDENTIALS_SUCCESS, - VERIFY_CREDENTIALS_FAIL, - type AuthAction, -} from '../actions/auth'; -import { ME_FETCH_SKIP, type MeAction } from '../actions/me'; - import type { PlfeResponse } from '@/api'; const instance = (() => { diff --git a/packages/pl-fe/src/reducers/filters.ts b/packages/pl-fe/src/reducers/filters.ts index 17aed76f3..8d36bb0aa 100644 --- a/packages/pl-fe/src/reducers/filters.ts +++ b/packages/pl-fe/src/reducers/filters.ts @@ -1,4 +1,4 @@ -import { FILTERS_FETCH_SUCCESS, type FiltersAction } from '../actions/filters'; +import { FILTERS_FETCH_SUCCESS, type FiltersAction } from '@/actions/filters'; import type { Filter } from 'pl-api'; diff --git a/packages/pl-fe/src/reducers/frontend-config.ts b/packages/pl-fe/src/reducers/frontend-config.ts index bfd8b829d..c71f5a151 100644 --- a/packages/pl-fe/src/reducers/frontend-config.ts +++ b/packages/pl-fe/src/reducers/frontend-config.ts @@ -1,13 +1,12 @@ -import { PLEROMA_PRELOAD_IMPORT } from '@/actions/preload'; -import KVStore from '@/storage/kv-store'; -import ConfigDB from '@/utils/config-db'; - -import { ADMIN_CONFIG_UPDATE_SUCCESS } from '../actions/admin'; +import { ADMIN_CONFIG_UPDATE_SUCCESS } from '@/actions/admin'; import { FRONTEND_CONFIG_REMEMBER_SUCCESS, FRONTEND_CONFIG_REQUEST_SUCCESS, FRONTEND_CONFIG_REQUEST_FAIL, -} from '../actions/frontend-config'; +} from '@/actions/frontend-config'; +import { PLEROMA_PRELOAD_IMPORT } from '@/actions/preload'; +import KVStore from '@/storage/kv-store'; +import ConfigDB from '@/utils/config-db'; import type { FrontendConfig } from '@/schemas/frontend-config'; import type { PleromaConfig } from 'pl-api'; diff --git a/packages/pl-fe/src/reducers/me.ts b/packages/pl-fe/src/reducers/me.ts index a245d151e..660cbd720 100644 --- a/packages/pl-fe/src/reducers/me.ts +++ b/packages/pl-fe/src/reducers/me.ts @@ -3,14 +3,14 @@ import { AUTH_ACCOUNT_REMEMBER_SUCCESS, VERIFY_CREDENTIALS_SUCCESS, type AuthAction, -} from '../actions/auth'; +} from '@/actions/auth'; import { ME_FETCH_SUCCESS, ME_FETCH_FAIL, ME_FETCH_SKIP, ME_PATCH_SUCCESS, type MeAction, -} from '../actions/me'; +} from '@/actions/me'; import type { PlfeResponse } from '@/api'; diff --git a/packages/pl-fe/src/reducers/push-notifications.ts b/packages/pl-fe/src/reducers/push-notifications.ts index 88aba091a..507249a42 100644 --- a/packages/pl-fe/src/reducers/push-notifications.ts +++ b/packages/pl-fe/src/reducers/push-notifications.ts @@ -4,7 +4,7 @@ import { SET_BROWSER_SUPPORT, SET_SUBSCRIPTION, CLEAR_SUBSCRIPTION, -} from '../actions/push-notifications/setter'; +} from '@/actions/push-notifications/setter'; import type { SetterAction } from '@/actions/push-notifications/setter'; diff --git a/packages/pl-fe/src/reducers/statuses.ts b/packages/pl-fe/src/reducers/statuses.ts index 255a8a15a..d4f7996fd 100644 --- a/packages/pl-fe/src/reducers/statuses.ts +++ b/packages/pl-fe/src/reducers/statuses.ts @@ -8,23 +8,20 @@ import { } from 'pl-api'; import * as v from 'valibot'; -import { simulateEmojiReact, simulateUnEmojiReact } from '@/utils/emoji-reacts'; -import { unescapeHTML } from '@/utils/html'; - import { EMOJI_REACT_FAIL, EMOJI_REACT_REQUEST, UNEMOJI_REACT_REQUEST, type EmojiReactsAction, -} from '../actions/emoji-reacts'; +} from '@/actions/emoji-reacts'; import { EVENT_JOIN_REQUEST, EVENT_JOIN_FAIL, EVENT_LEAVE_REQUEST, EVENT_LEAVE_FAIL, type EventsAction, -} from '../actions/events'; -import { STATUS_IMPORT, STATUSES_IMPORT, type ImporterAction } from '../actions/importer'; +} from '@/actions/events'; +import { STATUS_IMPORT, STATUSES_IMPORT, type ImporterAction } from '@/actions/importer'; import { REBLOG_REQUEST, REBLOG_FAIL, @@ -37,7 +34,7 @@ import { UNDISLIKE_REQUEST, DISLIKE_FAIL, type InteractionsAction, -} from '../actions/interactions'; +} from '@/actions/interactions'; import { STATUS_CREATE_REQUEST, STATUS_CREATE_FAIL, @@ -48,8 +45,10 @@ import { STATUS_UNMUTE_SUCCESS, type StatusesAction, STATUS_DELETE_SUCCESS, -} from '../actions/statuses'; -import { TIMELINE_DELETE, type TimelineAction } from '../actions/timelines'; +} from '@/actions/statuses'; +import { TIMELINE_DELETE, type TimelineAction } from '@/actions/timelines'; +import { simulateEmojiReact, simulateUnEmojiReact } from '@/utils/emoji-reacts'; +import { unescapeHTML } from '@/utils/html'; const domParser = new DOMParser(); diff --git a/packages/pl-fe/src/reducers/timelines.ts b/packages/pl-fe/src/reducers/timelines.ts index 9e0882012..0f474b023 100644 --- a/packages/pl-fe/src/reducers/timelines.ts +++ b/packages/pl-fe/src/reducers/timelines.ts @@ -4,13 +4,13 @@ import { ACCOUNT_BLOCK_SUCCESS, ACCOUNT_MUTE_SUCCESS, type AccountsAction, -} from '../actions/accounts'; -import { PIN_SUCCESS, UNPIN_SUCCESS, type InteractionsAction } from '../actions/interactions'; +} from '@/actions/accounts'; +import { PIN_SUCCESS, UNPIN_SUCCESS, type InteractionsAction } from '@/actions/interactions'; import { STATUS_CREATE_REQUEST, STATUS_CREATE_SUCCESS, type StatusesAction, -} from '../actions/statuses'; +} from '@/actions/statuses'; import { TIMELINE_UPDATE, TIMELINE_DELETE, @@ -23,7 +23,7 @@ import { MAX_QUEUED_ITEMS, TIMELINE_SCROLL_TOP, type TimelineAction, -} from '../actions/timelines'; +} from '@/actions/timelines'; import type { NormalizedStatus as Status } from '@/reducers/statuses'; import type {