diff --git a/package.json b/package.json index 7b697fc82..825cb97b9 100644 --- a/package.json +++ b/package.json @@ -71,7 +71,7 @@ "@tailwindcss/aspect-ratio": "^0.4.2", "@tailwindcss/forms": "^0.5.9", "@tailwindcss/typography": "^0.5.15", - "@tanstack/react-query": "^5.0.0", + "@tanstack/react-query": "^5.59.13", "@types/escape-html": "^1.0.1", "@types/http-link-header": "^1.0.3", "@types/leaflet": "^1.8.0", diff --git a/src/api/hooks/instance/useInstanceV1.ts b/src/api/hooks/instance/useInstanceV1.ts index 2ca494287..c1e802156 100644 --- a/src/api/hooks/instance/useInstanceV1.ts +++ b/src/api/hooks/instance/useInstanceV1.ts @@ -1,11 +1,14 @@ -import { useQuery, UseQueryOptions } from '@tanstack/react-query'; +import { useQuery } from '@tanstack/react-query'; import { useApi } from 'soapbox/hooks'; import { InstanceV1, instanceV1Schema } from 'soapbox/schemas/instance'; -interface Opts extends Pick, 'enabled' | 'retryOnMount' | 'staleTime'> { +interface Opts { /** The base URL of the instance. */ baseUrl?: string; + enabled?: boolean; + retryOnMount?: boolean; + staleTime?: number; } /** Get the Instance for the current backend. */ diff --git a/src/api/hooks/instance/useInstanceV2.ts b/src/api/hooks/instance/useInstanceV2.ts index d3376063a..25b1de014 100644 --- a/src/api/hooks/instance/useInstanceV2.ts +++ b/src/api/hooks/instance/useInstanceV2.ts @@ -1,11 +1,14 @@ -import { useQuery, UseQueryOptions } from '@tanstack/react-query'; +import { useQuery } from '@tanstack/react-query'; import { useApi } from 'soapbox/hooks'; import { InstanceV2, instanceV2Schema } from 'soapbox/schemas/instance'; -interface Opts extends Pick, 'enabled' | 'retryOnMount' | 'staleTime'> { +interface Opts { /** The base URL of the instance. */ baseUrl?: string; + enabled?: boolean; + retryOnMount?: boolean; + staleTime?: number; } /** Get the Instance for the current backend. */ diff --git a/src/features/admin/announcements.tsx b/src/features/admin/announcements.tsx index 18f0e6cb4..7af9d28c6 100644 --- a/src/features/admin/announcements.tsx +++ b/src/features/admin/announcements.tsx @@ -115,7 +115,7 @@ const Announcements: React.FC = () => { emptyMessage={emptyMessage} itemClassName='py-3 first:pt-0 last:pb-0' isLoading={isLoading} - showLoading={isLoading && !announcements?.length} + showLoading={isLoading} > {announcements!.map((announcement) => ( diff --git a/src/hooks/useInstance.ts b/src/hooks/useInstance.ts index eb7bed170..46557f587 100644 --- a/src/hooks/useInstance.ts +++ b/src/hooks/useInstance.ts @@ -1,4 +1,3 @@ -import { UseQueryOptions } from '@tanstack/react-query'; import { useEffect, useMemo } from 'react'; import { HTTPError } from 'soapbox/api/HTTPError'; @@ -8,9 +7,12 @@ import { instanceV2Schema, upgradeInstance } from 'soapbox/schemas/instance'; import { useAppDispatch } from './useAppDispatch'; -interface Opts extends Pick, 'enabled' | 'retryOnMount' | 'staleTime'> { +interface Opts { /** The base URL of the instance. */ baseUrl?: string; + enabled?: boolean; + retryOnMount?: boolean; + staleTime?: number; } /** Get the Instance for the current backend. */ diff --git a/yarn.lock b/yarn.lock index 82b4aa172..02e4db89a 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2398,17 +2398,17 @@ lodash.merge "^4.6.2" postcss-selector-parser "6.0.10" -"@tanstack/query-core@5.0.0": - version "5.0.0" - resolved "https://registry.yarnpkg.com/@tanstack/query-core/-/query-core-5.0.0.tgz#b37a50bb3a4f54336b6131db00b72cd29e79b480" - integrity sha512-Y1BpiA6BblJd/UlVqxEVeAG7IACn568YJuTTItAiecBI7En+33g780kg+/8lhgl+BzcUPN7o+NjBrSRGJoemyQ== +"@tanstack/query-core@5.59.13": + version "5.59.13" + resolved "https://registry.yarnpkg.com/@tanstack/query-core/-/query-core-5.59.13.tgz#8c962980af174bbd446b7e9b9999f7432897df80" + integrity sha512-Oou0bBu/P8+oYjXsJQ11j+gcpLAMpqW42UlokQYEz4dE7+hOtVO9rVuolJKgEccqzvyFzqX4/zZWY+R/v1wVsQ== -"@tanstack/react-query@^5.0.0": - version "5.0.0" - resolved "https://registry.yarnpkg.com/@tanstack/react-query/-/react-query-5.0.0.tgz#707fecb71cf53ae098f682f45520d7b1640bcaa9" - integrity sha512-diQoC8FNBcO5Uf5yuaJlXthTtbO1xM8kzOX+pSBUMT9n/cqQ/u1wJGCtukvhDWA+6j07WmIj4bfqNbd2KOB6jQ== +"@tanstack/react-query@^5.59.13": + version "5.59.13" + resolved "https://registry.yarnpkg.com/@tanstack/react-query/-/react-query-5.59.13.tgz#decac9c15ddc29a54dc3520a41a1dcedb1a9596a" + integrity sha512-GB2ELtiH8tL0rcFiM4sWvnXhazt1xRXX/LolMEV12kfEKu58aNA4lQoieslP61PO4vZO9JJMwm+6lqyS0E1HOA== dependencies: - "@tanstack/query-core" "5.0.0" + "@tanstack/query-core" "5.59.13" "@testing-library/dom@^9.0.0": version "9.0.1"