bwc9876.dev / witchsky.app
forked from jollywhoppers.com/witchsky.app
Bluesky app fork with some witchin' additions 💫
0
fork

Configure Feed

Select the types of activity you want to include in your feed.

Update React Query to latest (#10126)

authored by

Samuel Newman and committed by
GitHub 500fc1c9 b196ddef

+60 -53
+3 -3
package.json
··· 116 116 "@react-navigation/native": "^7.1.33", 117 117 "@react-navigation/native-stack": "^7.14.4", 118 118 "@sentry/react-native": "~6.20.0", 119 - "@tanstack/query-async-storage-persister": "^5.25.0", 120 - "@tanstack/react-query": "5.25.0", 121 - "@tanstack/react-query-persist-client": "^5.25.0", 119 + "@tanstack/query-async-storage-persister": "^5.95.2", 120 + "@tanstack/react-query": "^5.95.2", 121 + "@tanstack/react-query-persist-client": "^5.95.2", 122 122 "@tiptap/core": "^2.9.1", 123 123 "@tiptap/extension-document": "^2.9.1", 124 124 "@tiptap/extension-hard-break": "^2.9.1",
+32 -26
src/state/queries/resolve-uri.ts
··· 1 - import {AtUri} from '@atproto/api' 2 - import { 3 - type QueryClient, 4 - useQuery, 5 - type UseQueryResult, 6 - } from '@tanstack/react-query' 1 + import {AtUri, type BskyAgent} from '@atproto/api' 2 + import {type QueryClient, queryOptions, useQuery} from '@tanstack/react-query' 7 3 8 4 import {STALE} from '#/state/queries' 9 5 import {useAgent} from '#/state/session' ··· 12 8 const RQKEY_ROOT = 'resolved-did' 13 9 export const RQKEY = (didOrHandle: string) => [RQKEY_ROOT, didOrHandle] 14 10 15 - type UriUseQueryResult = UseQueryResult<{did: string; uri: string}, Error> 16 - export function useResolveUriQuery(uri: string | undefined): UriUseQueryResult { 17 - const urip = new AtUri(uri || '') 18 - const res = useResolveDidQuery(urip.host) 19 - if (res.data) { 20 - // @ts-expect-error TODO new-sdk-migration 21 - urip.host = res.data 22 - return { 23 - ...res, 24 - data: {did: urip.host, uri: urip.toString()}, 25 - } as UriUseQueryResult 26 - } 27 - return res as UriUseQueryResult 28 - } 29 - 30 - export function useResolveDidQuery(didOrHandle: string | undefined) { 31 - const agent = useAgent() 32 - const {getUnstableProfile} = useUnstableProfileViewCache() 33 - 34 - return useQuery<string, Error>({ 11 + const resolvedDidQueryOptions = ( 12 + agent: BskyAgent, 13 + getUnstableProfile: (did: string) => {did: string} | undefined, 14 + didOrHandle: string | undefined, 15 + ) => 16 + queryOptions({ 35 17 staleTime: STALE.HOURS.ONE, 36 18 queryKey: RQKEY(didOrHandle ?? ''), 37 19 queryFn: async () => { ··· 50 32 }, 51 33 enabled: !!didOrHandle, 52 34 }) 35 + 36 + export function useResolveUriQuery(uri: string | undefined) { 37 + const urip = new AtUri(uri || '') 38 + const host = urip.host 39 + 40 + const agent = useAgent() 41 + const {getUnstableProfile} = useUnstableProfileViewCache() 42 + 43 + return useQuery({ 44 + ...resolvedDidQueryOptions(agent, getUnstableProfile, host), 45 + select: did => ({ 46 + did, 47 + uri: urip.toString(), 48 + }), 49 + }) 50 + } 51 + 52 + export function useResolveDidQuery(didOrHandle: string | undefined) { 53 + const agent = useAgent() 54 + const {getUnstableProfile} = useUnstableProfileViewCache() 55 + 56 + return useQuery( 57 + resolvedDidQueryOptions(agent, getUnstableProfile, didOrHandle), 58 + ) 53 59 } 54 60 55 61 export function precacheResolvedUri(
+25 -24
yarn.lock
··· 5102 5102 dependencies: 5103 5103 "@sinonjs/commons" "^3.0.0" 5104 5104 5105 - "@tanstack/query-async-storage-persister@^5.25.0": 5106 - version "5.25.0" 5107 - resolved "https://registry.yarnpkg.com/@tanstack/query-async-storage-persister/-/query-async-storage-persister-5.25.0.tgz#0e8a2a781b8e32a81a5d02a688d6fcdfd055235b" 5108 - integrity sha512-58UTp1CuLr2mehsJRMOd8IZPtYGHFeL+uHnHyRd1kmbwo7wDaa8HXstiBdTRq5KokxIXy9FiFbA06LtKuOiwMQ== 5105 + "@tanstack/query-async-storage-persister@^5.95.2": 5106 + version "5.95.2" 5107 + resolved "https://registry.yarnpkg.com/@tanstack/query-async-storage-persister/-/query-async-storage-persister-5.95.2.tgz#0c7ed1c8013823e2d5abbb8d55bc0e9305abf7e0" 5108 + integrity sha512-ZhPIHH8J833OVZhEWwwdOk0uhY94d9Wgdnq97JoQx4Ui4xx4Dh6e7WPUrjlUWo88Yqi4Ij+T1o/VR7Vlbnkbjw== 5109 5109 dependencies: 5110 - "@tanstack/query-persist-client-core" "5.25.0" 5110 + "@tanstack/query-core" "5.95.2" 5111 + "@tanstack/query-persist-client-core" "5.95.2" 5111 5112 5112 - "@tanstack/query-core@5.25.0": 5113 - version "5.25.0" 5114 - resolved "https://registry.yarnpkg.com/@tanstack/query-core/-/query-core-5.25.0.tgz#e08ed0a9fad34c8005d1a282e57280031ac50cdc" 5115 - integrity sha512-vlobHP64HTuSE68lWF1mEhwSRC5Q7gaT+a/m9S+ItuN+ruSOxe1rFnR9j0ACWQ314BPhBEVKfBQ6mHL0OWfdbQ== 5113 + "@tanstack/query-core@5.95.2": 5114 + version "5.95.2" 5115 + resolved "https://registry.yarnpkg.com/@tanstack/query-core/-/query-core-5.95.2.tgz#9e3299d0c1c8785dd9e3d0cac1993e45f35113f2" 5116 + integrity sha512-o4T8vZHZET4Bib3jZ/tCW9/7080urD4c+0/AUaYVpIqOsr7y0reBc1oX3ttNaSW5mYyvZHctiQ/UOP2PfdmFEQ== 5116 5117 5117 - "@tanstack/query-persist-client-core@5.25.0": 5118 - version "5.25.0" 5119 - resolved "https://registry.yarnpkg.com/@tanstack/query-persist-client-core/-/query-persist-client-core-5.25.0.tgz#52fa634a8067d7b965854a532a33077fd4df0eff" 5120 - integrity sha512-sEUsEZ/XWkOosO45CDBI5nj5woCS+DUd9Dk8pGpU8MkeH0EVd3p4N5CdbjNhrreyy5Krf3rpNaiRN9ygLX/rWA== 5118 + "@tanstack/query-persist-client-core@5.95.2": 5119 + version "5.95.2" 5120 + resolved "https://registry.yarnpkg.com/@tanstack/query-persist-client-core/-/query-persist-client-core-5.95.2.tgz#1c94a87c9886a8e1c6a0a3ebbb325afdaf486f81" 5121 + integrity sha512-Opfj34WZ594YXpEcZEs8WBiyPGrjrKlGILfk/Ss283uwWQ36C5nX3tRY/bBiXmM82KWauUuNvahwGwiyco/8cQ== 5121 5122 dependencies: 5122 - "@tanstack/query-core" "5.25.0" 5123 + "@tanstack/query-core" "5.95.2" 5123 5124 5124 - "@tanstack/react-query-persist-client@^5.25.0": 5125 - version "5.25.0" 5126 - resolved "https://registry.yarnpkg.com/@tanstack/react-query-persist-client/-/react-query-persist-client-5.25.0.tgz#ecbd1362cd6fd94e723d54f5af477d0812852dab" 5127 - integrity sha512-j1+GyFj4UQGWuiFZoDUVJZS+wxqKd9SGvPlyHG619zzYNN+QQu4B5uvvHc6U8MroM377EOBOuLKK3W6qsAdahQ== 5125 + "@tanstack/react-query-persist-client@^5.95.2": 5126 + version "5.95.2" 5127 + resolved "https://registry.yarnpkg.com/@tanstack/react-query-persist-client/-/react-query-persist-client-5.95.2.tgz#4d6fe899513725978e86c13c1727ee7e393eaca5" 5128 + integrity sha512-i3fvzD8gaLgQyFvRc/+iSUr60aL31tMN+5QM11zdPRg0K9CirIQjHD7WgXFBnD29KJDvcjcv7OrIBaPwZ+H9xw== 5128 5129 dependencies: 5129 - "@tanstack/query-persist-client-core" "5.25.0" 5130 + "@tanstack/query-persist-client-core" "5.95.2" 5130 5131 5131 - "@tanstack/react-query@5.25.0": 5132 - version "5.25.0" 5133 - resolved "https://registry.yarnpkg.com/@tanstack/react-query/-/react-query-5.25.0.tgz#f4dac794cf10dd956aa56dbbdf67049a5ba2669d" 5134 - integrity sha512-u+n5R7mLO7RmeiIonpaCRVXNRWtZEef/aVZ/XGWRPa7trBIvGtzlfo0Ah7ZtnTYfrKEVwnZ/tzRCBcoiqJ/tFw== 5132 + "@tanstack/react-query@^5.95.2": 5133 + version "5.95.2" 5134 + resolved "https://registry.yarnpkg.com/@tanstack/react-query/-/react-query-5.95.2.tgz#7daf77342a4e374c22fad88bb98ea13fc19ae086" 5135 + integrity sha512-/wGkvLj/st5Ud1Q76KF1uFxScV7WeqN1slQx5280ycwAyYkIPGaRZAEgHxe3bjirSd5Zpwkj6zNcR4cqYni/ZA== 5135 5136 dependencies: 5136 - "@tanstack/query-core" "5.25.0" 5137 + "@tanstack/query-core" "5.95.2" 5137 5138 5138 5139 "@testing-library/react-native@^13.2.0": 5139 5140 version "13.2.0"