From bbbf6563c57f4984c2365f73496239a3eb31eb49 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?marcin=20miko=C5=82ajczak?= Date: Sun, 20 Oct 2024 00:56:12 +0200 Subject: [PATCH] pl-fe: remove some barrel imports/exports 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/api/hooks/accounts/useAccount.ts | 5 ++++- packages/pl-fe/src/api/hooks/accounts/useAccountScrobble.ts | 3 ++- packages/pl-fe/src/api/hooks/accounts/useFollow.ts | 4 +++- packages/pl-fe/src/api/hooks/accounts/useRelationships.ts | 3 ++- .../pl-fe/src/api/hooks/instance/useTranslationLanguages.ts | 5 ++++- packages/pl-fe/src/api/hooks/streaming/useTimelineStream.ts | 4 +++- packages/pl-fe/src/api/hooks/streaming/useUserStream.ts | 3 ++- packages/pl-fe/src/api/hooks/trends/useTrendingLinks.ts | 3 ++- packages/pl-fe/src/components/media-gallery.tsx | 3 ++- packages/pl-fe/src/components/navlinks.tsx | 3 ++- packages/pl-fe/src/components/status-content.tsx | 3 ++- packages/pl-fe/src/components/status.tsx | 4 +++- .../src/components/statuses/sensitive-content-overlay.tsx | 3 ++- packages/pl-fe/src/contexts/chat-context.tsx | 3 ++- .../features/admin/components/registration-mode-picker.tsx | 3 ++- .../pl-fe/src/features/chats/components/chat-composer.tsx | 3 ++- .../editor/plugins/floating-block-type-toolbar-plugin.tsx | 3 ++- packages/pl-fe/src/features/migration/index.tsx | 3 ++- packages/pl-fe/src/features/notifications/index.tsx | 4 +++- packages/pl-fe/src/features/ui/components/theme-toggle.tsx | 3 ++- 20 files changed, 48 insertions(+), 20 deletions(-) diff --git a/packages/pl-fe/src/api/hooks/accounts/useAccount.ts b/packages/pl-fe/src/api/hooks/accounts/useAccount.ts index 0ee4c82a8..f15310bfd 100644 --- a/packages/pl-fe/src/api/hooks/accounts/useAccount.ts +++ b/packages/pl-fe/src/api/hooks/accounts/useAccount.ts @@ -3,7 +3,10 @@ import { useHistory } from 'react-router-dom'; import { Entities } from 'pl-fe/entity-store/entities'; import { useEntity } from 'pl-fe/entity-store/hooks/useEntity'; -import { useAppSelector, useClient, useFeatures, useLoggedIn } from 'pl-fe/hooks'; +import { useAppSelector } from 'pl-fe/hooks/useAppSelector'; +import { useClient } from 'pl-fe/hooks/useClient'; +import { useFeatures } from 'pl-fe/hooks/useFeatures'; +import { useLoggedIn } from 'pl-fe/hooks/useLoggedIn'; import { type Account, normalizeAccount } from 'pl-fe/normalizers'; import { useAccountScrobble } from './useAccountScrobble'; diff --git a/packages/pl-fe/src/api/hooks/accounts/useAccountScrobble.ts b/packages/pl-fe/src/api/hooks/accounts/useAccountScrobble.ts index bdf568b9c..86269a3ed 100644 --- a/packages/pl-fe/src/api/hooks/accounts/useAccountScrobble.ts +++ b/packages/pl-fe/src/api/hooks/accounts/useAccountScrobble.ts @@ -1,6 +1,7 @@ import { useQuery } from '@tanstack/react-query'; -import { useClient, useFeatures } from 'pl-fe/hooks'; +import { useClient } from 'pl-fe/hooks/useClient'; +import { useFeatures } from 'pl-fe/hooks/useFeatures'; import type { Scrobble } from 'pl-api'; diff --git a/packages/pl-fe/src/api/hooks/accounts/useFollow.ts b/packages/pl-fe/src/api/hooks/accounts/useFollow.ts index da3f5670a..931487734 100644 --- a/packages/pl-fe/src/api/hooks/accounts/useFollow.ts +++ b/packages/pl-fe/src/api/hooks/accounts/useFollow.ts @@ -1,7 +1,9 @@ import { importEntities } from 'pl-fe/entity-store/actions'; import { Entities } from 'pl-fe/entity-store/entities'; import { useTransaction } from 'pl-fe/entity-store/hooks/useTransaction'; -import { useAppDispatch, useClient, useLoggedIn } from 'pl-fe/hooks'; +import { useAppDispatch } from 'pl-fe/hooks/useAppDispatch'; +import { useClient } from 'pl-fe/hooks/useClient'; +import { useLoggedIn } from 'pl-fe/hooks/useLoggedIn'; interface FollowOpts { reblogs?: boolean; diff --git a/packages/pl-fe/src/api/hooks/accounts/useRelationships.ts b/packages/pl-fe/src/api/hooks/accounts/useRelationships.ts index c14ca9844..c0b44e5cb 100644 --- a/packages/pl-fe/src/api/hooks/accounts/useRelationships.ts +++ b/packages/pl-fe/src/api/hooks/accounts/useRelationships.ts @@ -1,6 +1,7 @@ import { Entities } from 'pl-fe/entity-store/entities'; import { useBatchedEntities } from 'pl-fe/entity-store/hooks/useBatchedEntities'; -import { useClient, useLoggedIn } from 'pl-fe/hooks'; +import { useClient } from 'pl-fe/hooks/useClient'; +import { useLoggedIn } from 'pl-fe/hooks/useLoggedIn'; import type { Relationship } from 'pl-api'; diff --git a/packages/pl-fe/src/api/hooks/instance/useTranslationLanguages.ts b/packages/pl-fe/src/api/hooks/instance/useTranslationLanguages.ts index 50e97522b..471c20595 100644 --- a/packages/pl-fe/src/api/hooks/instance/useTranslationLanguages.ts +++ b/packages/pl-fe/src/api/hooks/instance/useTranslationLanguages.ts @@ -1,6 +1,9 @@ import { useQuery } from '@tanstack/react-query'; -import { useClient, useFeatures, useInstance, useLoggedIn } from 'pl-fe/hooks'; +import { useClient } from 'pl-fe/hooks/useClient'; +import { useFeatures } from 'pl-fe/hooks/useFeatures'; +import { useInstance } from 'pl-fe/hooks/useInstance'; +import { useLoggedIn } from 'pl-fe/hooks/useLoggedIn'; const useTranslationLanguages = () => { const client = useClient(); diff --git a/packages/pl-fe/src/api/hooks/streaming/useTimelineStream.ts b/packages/pl-fe/src/api/hooks/streaming/useTimelineStream.ts index 97924198b..ce94aca46 100644 --- a/packages/pl-fe/src/api/hooks/streaming/useTimelineStream.ts +++ b/packages/pl-fe/src/api/hooks/streaming/useTimelineStream.ts @@ -1,6 +1,8 @@ import { useEffect, useRef } from 'react'; -import { useAppSelector, useClient, useInstance } from 'pl-fe/hooks'; +import { useAppSelector } from 'pl-fe/hooks/useAppSelector'; +import { useClient } from 'pl-fe/hooks/useClient'; +import { useInstance } from 'pl-fe/hooks/useInstance'; import { getAccessToken } from 'pl-fe/utils/auth'; import type { StreamingEvent } from 'pl-api'; diff --git a/packages/pl-fe/src/api/hooks/streaming/useUserStream.ts b/packages/pl-fe/src/api/hooks/streaming/useUserStream.ts index c60297266..35c3aca81 100644 --- a/packages/pl-fe/src/api/hooks/streaming/useUserStream.ts +++ b/packages/pl-fe/src/api/hooks/streaming/useUserStream.ts @@ -11,7 +11,8 @@ import { useStatContext } from 'pl-fe/contexts/stat-context'; import { importEntities } from 'pl-fe/entity-store/actions'; import { Entities } from 'pl-fe/entity-store/entities'; import { selectEntity } from 'pl-fe/entity-store/selectors'; -import { useAppDispatch, useLoggedIn } from 'pl-fe/hooks'; +import { useAppDispatch } from 'pl-fe/hooks/useAppDispatch'; +import { useLoggedIn } from 'pl-fe/hooks/useLoggedIn'; import messages from 'pl-fe/messages'; import { queryClient } from 'pl-fe/queries/client'; import { useSettingsStore } from 'pl-fe/stores/settings'; diff --git a/packages/pl-fe/src/api/hooks/trends/useTrendingLinks.ts b/packages/pl-fe/src/api/hooks/trends/useTrendingLinks.ts index 7dd3730c6..9eaa55af1 100644 --- a/packages/pl-fe/src/api/hooks/trends/useTrendingLinks.ts +++ b/packages/pl-fe/src/api/hooks/trends/useTrendingLinks.ts @@ -1,6 +1,7 @@ import { Entities } from 'pl-fe/entity-store/entities'; import { useEntities } from 'pl-fe/entity-store/hooks/useEntities'; -import { useClient, useFeatures } from 'pl-fe/hooks'; +import { useClient } from 'pl-fe/hooks/useClient'; +import { useFeatures } from 'pl-fe/hooks/useFeatures'; import type { TrendsLink } from 'pl-api'; diff --git a/packages/pl-fe/src/components/media-gallery.tsx b/packages/pl-fe/src/components/media-gallery.tsx index ad84f1dd7..03e67cf69 100644 --- a/packages/pl-fe/src/components/media-gallery.tsx +++ b/packages/pl-fe/src/components/media-gallery.tsx @@ -5,7 +5,8 @@ import Blurhash from 'pl-fe/components/blurhash'; import Icon from 'pl-fe/components/icon'; import StillImage from 'pl-fe/components/still-image'; import { MIMETYPE_ICONS } from 'pl-fe/components/upload'; -import { useSettings, usePlFeConfig } from 'pl-fe/hooks'; +import { usePlFeConfig } from 'pl-fe/hooks/usePlFeConfig'; +import { useSettings } from 'pl-fe/hooks/useSettings'; import { truncateFilename } from 'pl-fe/utils/media'; import { isIOS } from '../is-mobile'; diff --git a/packages/pl-fe/src/components/navlinks.tsx b/packages/pl-fe/src/components/navlinks.tsx index 0af7e4103..84dc68735 100644 --- a/packages/pl-fe/src/components/navlinks.tsx +++ b/packages/pl-fe/src/components/navlinks.tsx @@ -2,7 +2,8 @@ import React from 'react'; import { Link } from 'react-router-dom'; import Text from 'pl-fe/components/ui/text'; -import { useSettings, usePlFeConfig } from 'pl-fe/hooks'; +import { usePlFeConfig } from 'pl-fe/hooks/usePlFeConfig'; +import { useSettings } from 'pl-fe/hooks/useSettings'; interface INavlinks { type: string; diff --git a/packages/pl-fe/src/components/status-content.tsx b/packages/pl-fe/src/components/status-content.tsx index af44f613f..9404c59cc 100644 --- a/packages/pl-fe/src/components/status-content.tsx +++ b/packages/pl-fe/src/components/status-content.tsx @@ -7,7 +7,8 @@ import Icon from 'pl-fe/components/icon'; import Button from 'pl-fe/components/ui/button'; import Stack from 'pl-fe/components/ui/stack'; import Text from 'pl-fe/components/ui/text'; -import { useAppDispatch, useSettings } from 'pl-fe/hooks'; +import { useAppDispatch } from 'pl-fe/hooks/useAppDispatch'; +import { useSettings } from 'pl-fe/hooks/useSettings'; import { onlyEmoji as isOnlyEmoji } from 'pl-fe/utils/rich-content'; import { getTextDirection } from '../utils/rtl'; diff --git a/packages/pl-fe/src/components/status.tsx b/packages/pl-fe/src/components/status.tsx index bea427377..3593aec1c 100644 --- a/packages/pl-fe/src/components/status.tsx +++ b/packages/pl-fe/src/components/status.tsx @@ -15,7 +15,9 @@ import AccountContainer from 'pl-fe/containers/account-container'; import StatusTypeIcon from 'pl-fe/features/status/components/status-type-icon'; import QuotedStatus from 'pl-fe/features/status/containers/quoted-status-container'; import { HotKeys } from 'pl-fe/features/ui/components/hotkeys'; -import { useAppDispatch, useAppSelector, useSettings } from 'pl-fe/hooks'; +import { useAppDispatch } from 'pl-fe/hooks/useAppDispatch'; +import { useAppSelector } from 'pl-fe/hooks/useAppSelector'; +import { useSettings } from 'pl-fe/hooks/useSettings'; import { makeGetStatus, type SelectedStatus } from 'pl-fe/selectors'; import { useModalsStore } from 'pl-fe/stores/modals'; import { textForScreenReader } from 'pl-fe/utils/status'; diff --git a/packages/pl-fe/src/components/statuses/sensitive-content-overlay.tsx b/packages/pl-fe/src/components/statuses/sensitive-content-overlay.tsx index 83ab2d835..5fd218a89 100644 --- a/packages/pl-fe/src/components/statuses/sensitive-content-overlay.tsx +++ b/packages/pl-fe/src/components/statuses/sensitive-content-overlay.tsx @@ -6,7 +6,8 @@ import { hideStatusMedia, revealStatusMedia } from 'pl-fe/actions/statuses'; import Button from 'pl-fe/components/ui/button'; import HStack from 'pl-fe/components/ui/hstack'; import Text from 'pl-fe/components/ui/text'; -import { useAppDispatch, useSettings } from 'pl-fe/hooks'; +import { useAppDispatch } from 'pl-fe/hooks/useAppDispatch'; +import { useSettings } from 'pl-fe/hooks/useSettings'; import type { Status } from 'pl-fe/normalizers/status'; diff --git a/packages/pl-fe/src/contexts/chat-context.tsx b/packages/pl-fe/src/contexts/chat-context.tsx index 011f23a5b..76141dc3e 100644 --- a/packages/pl-fe/src/contexts/chat-context.tsx +++ b/packages/pl-fe/src/contexts/chat-context.tsx @@ -2,7 +2,8 @@ import React, { createContext, useContext, useEffect, useMemo, useState } from ' import { useHistory, useParams } from 'react-router-dom'; import { toggleMainWindow } from 'pl-fe/actions/chats'; -import { useAppDispatch, useSettings } from 'pl-fe/hooks'; +import { useAppDispatch } from 'pl-fe/hooks/useAppDispatch'; +import { useSettings } from 'pl-fe/hooks/useSettings'; import { useChat } from 'pl-fe/queries/chats'; import type { Chat } from 'pl-api'; diff --git a/packages/pl-fe/src/features/admin/components/registration-mode-picker.tsx b/packages/pl-fe/src/features/admin/components/registration-mode-picker.tsx index 19cabc6f7..9a111d391 100644 --- a/packages/pl-fe/src/features/admin/components/registration-mode-picker.tsx +++ b/packages/pl-fe/src/features/admin/components/registration-mode-picker.tsx @@ -4,7 +4,8 @@ import { useIntl, defineMessages, FormattedMessage } from 'react-intl'; import { updateConfig } from 'pl-fe/actions/admin'; import { RadioGroup, RadioItem } from 'pl-fe/components/radio'; -import { useAppDispatch, useInstance } from 'pl-fe/hooks'; +import { useAppDispatch } from 'pl-fe/hooks/useAppDispatch'; +import { useInstance } from 'pl-fe/hooks/useInstance'; import toast from 'pl-fe/toast'; type RegistrationMode = 'open' | 'approval' | 'closed'; diff --git a/packages/pl-fe/src/features/chats/components/chat-composer.tsx b/packages/pl-fe/src/features/chats/components/chat-composer.tsx index c8a807b16..bde675b45 100644 --- a/packages/pl-fe/src/features/chats/components/chat-composer.tsx +++ b/packages/pl-fe/src/features/chats/components/chat-composer.tsx @@ -12,7 +12,8 @@ import Text from 'pl-fe/components/ui/text'; import { useChatContext } from 'pl-fe/contexts/chat-context'; import UploadButton from 'pl-fe/features/compose/components/upload-button'; import emojiSearch from 'pl-fe/features/emoji/search'; -import { useAppDispatch, useInstance } from 'pl-fe/hooks'; +import { useAppDispatch } from 'pl-fe/hooks/useAppDispatch'; +import { useInstance } from 'pl-fe/hooks/useInstance'; import { useModalsStore } from 'pl-fe/stores/modals'; import { textAtCursorMatchesToken } from 'pl-fe/utils/suggestions'; diff --git a/packages/pl-fe/src/features/compose/editor/plugins/floating-block-type-toolbar-plugin.tsx b/packages/pl-fe/src/features/compose/editor/plugins/floating-block-type-toolbar-plugin.tsx index 3b10cf56c..a54ae6f50 100644 --- a/packages/pl-fe/src/features/compose/editor/plugins/floating-block-type-toolbar-plugin.tsx +++ b/packages/pl-fe/src/features/compose/editor/plugins/floating-block-type-toolbar-plugin.tsx @@ -23,7 +23,8 @@ import { createPortal } from 'react-dom'; import { defineMessages, useIntl } from 'react-intl'; import { uploadFile } from 'pl-fe/actions/compose'; -import { useAppDispatch, useInstance } from 'pl-fe/hooks'; +import { useAppDispatch } from 'pl-fe/hooks/useAppDispatch'; +import { useInstance } from 'pl-fe/hooks/useInstance'; import { $createImageNode } from '../nodes/image-node'; import { setFloatingElemPosition } from '../utils/set-floating-elem-position'; diff --git a/packages/pl-fe/src/features/migration/index.tsx b/packages/pl-fe/src/features/migration/index.tsx index e33d0a6e3..3f74d2110 100644 --- a/packages/pl-fe/src/features/migration/index.tsx +++ b/packages/pl-fe/src/features/migration/index.tsx @@ -10,7 +10,8 @@ import FormActions from 'pl-fe/components/ui/form-actions'; import FormGroup from 'pl-fe/components/ui/form-group'; import Input from 'pl-fe/components/ui/input'; import Text from 'pl-fe/components/ui/text'; -import { useAppDispatch, useInstance } from 'pl-fe/hooks'; +import { useAppDispatch } from 'pl-fe/hooks/useAppDispatch'; +import { useInstance } from 'pl-fe/hooks/useInstance'; import toast from 'pl-fe/toast'; const messages = defineMessages({ diff --git a/packages/pl-fe/src/features/notifications/index.tsx b/packages/pl-fe/src/features/notifications/index.tsx index 788b30e79..a7f5a247d 100644 --- a/packages/pl-fe/src/features/notifications/index.tsx +++ b/packages/pl-fe/src/features/notifications/index.tsx @@ -16,7 +16,9 @@ import ScrollableList from 'pl-fe/components/scrollable-list'; import Column from 'pl-fe/components/ui/column'; import Portal from 'pl-fe/components/ui/portal'; import PlaceholderNotification from 'pl-fe/features/placeholder/components/placeholder-notification'; -import { useAppDispatch, useAppSelector, useSettings } from 'pl-fe/hooks'; +import { useAppDispatch } from 'pl-fe/hooks/useAppDispatch'; +import { useAppSelector } from 'pl-fe/hooks/useAppSelector'; +import { useSettings } from 'pl-fe/hooks/useSettings'; import FilterBar from './components/filter-bar'; import Notification from './components/notification'; diff --git a/packages/pl-fe/src/features/ui/components/theme-toggle.tsx b/packages/pl-fe/src/features/ui/components/theme-toggle.tsx index 2bbe6ef9c..577068017 100644 --- a/packages/pl-fe/src/features/ui/components/theme-toggle.tsx +++ b/packages/pl-fe/src/features/ui/components/theme-toggle.tsx @@ -1,7 +1,8 @@ import React from 'react'; import { changeSetting } from 'pl-fe/actions/settings'; -import { useAppDispatch, useSettings } from 'pl-fe/hooks'; +import { useAppDispatch } from 'pl-fe/hooks/useAppDispatch'; +import { useSettings } from 'pl-fe/hooks/useSettings'; import ThemeSelector from './theme-selector';