Merge branch 'cycles' into 'develop'

Resolve some circular dependencies

See merge request soapbox-pub/soapbox!2688

app/soapbox/api/hooks/streaming/useDirectStream.ts

@@ -1,4 +1,4 @@
-import { useLoggedIn } from 'soapbox/hooks';
+import { useLoggedIn } from 'soapbox/hooks/useLoggedIn';
 
 import { useTimelineStream } from './useTimelineStream';
 

app/soapbox/components/ui/card/card.tsx

@@ -3,9 +3,11 @@ import React from 'react';
 import { defineMessages, useIntl } from 'react-intl';
 import { Link } from 'react-router-dom';
 
-import { HStack, Text } from 'soapbox/components/ui';
 import SvgIcon from 'soapbox/components/ui/icon/svg-icon';
 
+import HStack from '../hstack/hstack';
+import Text from '../text/text';
+
 const sizes = {
   md: 'p-4 sm:rounded-xl',
   lg: 'p-4 sm:p-6 sm:rounded-xl',

app/soapbox/entity-store/hooks/useBatchedEntities.ts

@@ -1,7 +1,9 @@
 import { useEffect } from 'react';
 import { z } from 'zod';
 
-import { useAppDispatch, useAppSelector, useGetState } from 'soapbox/hooks';
+import { useAppDispatch } from 'soapbox/hooks/useAppDispatch';
+import { useAppSelector } from 'soapbox/hooks/useAppSelector';
+import { useGetState } from 'soapbox/hooks/useGetState';
 import { filteredArray } from 'soapbox/schemas/utils';
 
 import { entitiesFetchFail, entitiesFetchRequest, entitiesFetchSuccess } from '../actions';

app/soapbox/entity-store/hooks/useChangeEntity.ts

@@ -1,7 +1,8 @@
 import { importEntities } from 'soapbox/entity-store/actions';
 import { Entities } from 'soapbox/entity-store/entities';
 import { type Entity } from 'soapbox/entity-store/types';
-import { useAppDispatch, useGetState } from 'soapbox/hooks';
+import { useAppDispatch } from 'soapbox/hooks/useAppDispatch';
+import { useGetState } from 'soapbox/hooks/useGetState';
 
 type ChangeEntityFn<TEntity extends Entity> = (entity: TEntity) => TEntity
 

app/soapbox/entity-store/hooks/useCreateEntity.ts

@@ -1,7 +1,8 @@
 import { AxiosError } from 'axios';
 import { z } from 'zod';
 
-import { useAppDispatch, useLoading } from 'soapbox/hooks';
+import { useAppDispatch } from 'soapbox/hooks/useAppDispatch';
+import { useLoading } from 'soapbox/hooks/useLoading';
 
 import { importEntities } from '../actions';
 

app/soapbox/entity-store/hooks/useDeleteEntity.ts

@@ -1,4 +1,6 @@
-import { useAppDispatch, useGetState, useLoading } from 'soapbox/hooks';
+import { useAppDispatch } from 'soapbox/hooks/useAppDispatch';
+import { useGetState } from 'soapbox/hooks/useGetState';
+import { useLoading } from 'soapbox/hooks/useLoading';
 
 import { deleteEntities, importEntities } from '../actions';
 

app/soapbox/entity-store/hooks/useDismissEntity.ts

@@ -1,4 +1,5 @@
-import { useAppDispatch, useLoading } from 'soapbox/hooks';
+import { useAppDispatch } from 'soapbox/hooks/useAppDispatch';
+import { useLoading } from 'soapbox/hooks/useLoading';
 
 import { dismissEntities } from '../actions';
 

app/soapbox/entity-store/hooks/useEntities.ts

@@ -2,7 +2,10 @@ import { useEffect } from 'react';
 import z from 'zod';
 
 import { getNextLink, getPrevLink } from 'soapbox/api';
-import { useApi, useAppDispatch, useAppSelector, useGetState } from 'soapbox/hooks';
+import { useApi } from 'soapbox/hooks/useApi';
+import { useAppDispatch } from 'soapbox/hooks/useAppDispatch';
+import { useAppSelector } from 'soapbox/hooks/useAppSelector';
+import { useGetState } from 'soapbox/hooks/useGetState';
 import { filteredArray } from 'soapbox/schemas/utils';
 import { realNumberSchema } from 'soapbox/utils/numbers';
 

app/soapbox/entity-store/hooks/useEntity.ts

@@ -2,7 +2,9 @@ import { AxiosError } from 'axios';
 import { useEffect, useState } from 'react';
 import z from 'zod';
 
-import { useAppDispatch, useAppSelector, useLoading } from 'soapbox/hooks';
+import { useAppDispatch } from 'soapbox/hooks/useAppDispatch';
+import { useAppSelector } from 'soapbox/hooks/useAppSelector';
+import { useLoading } from 'soapbox/hooks/useLoading';
 
 import { importEntities } from '../actions';
 import { selectEntity } from '../selectors';

app/soapbox/entity-store/hooks/useEntityActions.ts

@@ -1,4 +1,4 @@
-import { useApi } from 'soapbox/hooks';
+import { useApi } from 'soapbox/hooks/useApi';
 
 import { useCreateEntity } from './useCreateEntity';
 import { useDeleteEntity } from './useDeleteEntity';

app/soapbox/entity-store/hooks/useEntityLookup.ts

@@ -2,7 +2,9 @@ import { AxiosError } from 'axios';
 import { useEffect, useState } from 'react';
 import { z } from 'zod';
 
-import { useAppDispatch, useAppSelector, useLoading } from 'soapbox/hooks';
+import { useAppDispatch } from 'soapbox/hooks/useAppDispatch';
+import { useAppSelector } from 'soapbox/hooks/useAppSelector';
+import { useLoading } from 'soapbox/hooks/useLoading';
 
 import { importEntities } from '../actions';
 import { findEntity } from '../selectors';

app/soapbox/entity-store/hooks/useIncrementEntity.ts

@@ -1,4 +1,5 @@
-import { useAppDispatch, useLoading } from 'soapbox/hooks';
+import { useAppDispatch } from 'soapbox/hooks/useAppDispatch';
+import { useLoading } from 'soapbox/hooks/useLoading';
 
 import { incrementEntities } from '../actions';
 

app/soapbox/entity-store/hooks/useTransaction.ts

@@ -1,5 +1,5 @@
 import { entitiesTransaction } from 'soapbox/entity-store/actions';
-import { useAppDispatch } from 'soapbox/hooks';
+import { useAppDispatch } from 'soapbox/hooks/useAppDispatch';
 
 import type { EntityTypes } from 'soapbox/entity-store/entities';
 import type { EntitiesTransaction, Entity } from 'soapbox/entity-store/types';

app/soapbox/hooks/useCompose.ts

@@ -1,4 +1,4 @@
-import { useAppSelector } from 'soapbox/hooks';
+import { useAppSelector } from './useAppSelector';
 
 import type { ReducerCompose } from 'soapbox/reducers/compose';
 

app/soapbox/hooks/useGroupsPath.ts

@@ -1,4 +1,4 @@
-import { useGroups } from 'soapbox/api/hooks';
+import { useGroups } from 'soapbox/api/hooks/groups/useGroups';
 
 import { useFeatures } from './useFeatures';
 

app/soapbox/hooks/useInstance.ts

@@ -1,4 +1,4 @@
-import { useAppSelector } from 'soapbox/hooks';
+import { useAppSelector } from './useAppSelector';
 
 /** Get the Instance for the current backend. */
 export const useInstance = () => {

app/soapbox/hooks/useOwnAccount.ts

@@ -1,8 +1,9 @@
 import { useCallback } from 'react';
 
-import { useAppSelector } from 'soapbox/hooks';
 import { makeGetAccount } from 'soapbox/selectors';
 
+import { useAppSelector } from './useAppSelector';
+
 /** Get the logged-in account from the store, if any. */
 export const useOwnAccount = () => {
   const getAccount = useCallback(makeGetAccount(), []);

app/soapbox/hooks/useSettings.ts

@@ -1,5 +1,6 @@
 import { getSettings } from 'soapbox/actions/settings';
-import { useAppSelector } from 'soapbox/hooks';
+
+import { useAppSelector } from './useAppSelector';
 
 import type { Map as ImmutableMap } from 'immutable';
 

app/soapbox/hooks/useSoapboxConfig.ts

@@ -1,5 +1,6 @@
 import { getSoapboxConfig } from 'soapbox/actions/soapbox';
-import { useAppSelector } from 'soapbox/hooks';
+
+import { useAppSelector } from './useAppSelector';
 
 import type { SoapboxConfig } from 'soapbox/types/soapbox';