From 40db806fe58e0db7ce9f7f75a60a43afe67fbb20 Mon Sep 17 00:00:00 2001 From: Eric Bailey Date: Wed, 8 Jan 2025 09:35:40 -0600 Subject: [PATCH] Bump sdk, update $Typed imports --- package.json | 2 +- src/components/dms/ReportDialog.tsx | 2 +- src/lib/api/index.ts | 2 +- src/lib/generate-starterpack.ts | 2 +- .../Messages/components/MessagesList.tsx | 8 +++- src/screens/Onboarding/util.ts | 2 +- src/screens/Settings/components/PwiOptOut.tsx | 3 +- src/state/queries/list.ts | 2 +- src/state/queries/postgate/util.ts | 2 +- yarn.lock | 43 ++++++++++++++++--- 10 files changed, 50 insertions(+), 18 deletions(-) diff --git a/package.json b/package.json index ec4595eb4b..8d2d4c8571 100644 --- a/package.json +++ b/package.json @@ -54,7 +54,7 @@ "icons:optimize": "svgo -f ./assets/icons" }, "dependencies": { - "@atproto/api": "0.14.0-next.1", + "@atproto/api": "0.14.0-next.2", "@braintree/sanitize-url": "^6.0.2", "@discord/bottom-sheet": "bluesky-social/react-native-bottom-sheet", "@emoji-mart/react": "^1.1.1", diff --git a/src/components/dms/ReportDialog.tsx b/src/components/dms/ReportDialog.tsx index f9b7d68732..1ca14c10fd 100644 --- a/src/components/dms/ReportDialog.tsx +++ b/src/components/dms/ReportDialog.tsx @@ -1,11 +1,11 @@ import React, {memo, useMemo, useState} from 'react' import {View} from 'react-native' import { + $Typed, ChatBskyConvoDefs, ComAtprotoModerationCreateReport, RichText as RichTextAPI, } from '@atproto/api' -import {$Typed} from '@atproto/api/dist/client/util' import {msg, Trans} from '@lingui/macro' import {useLingui} from '@lingui/react' import {useMutation} from '@tanstack/react-query' diff --git a/src/lib/api/index.ts b/src/lib/api/index.ts index 1803a811ac..6c473b19e3 100644 --- a/src/lib/api/index.ts +++ b/src/lib/api/index.ts @@ -1,4 +1,5 @@ import { + $Typed, AppBskyEmbedExternal, AppBskyEmbedImages, AppBskyEmbedRecord, @@ -13,7 +14,6 @@ import { ComAtprotoRepoStrongRef, RichText, } from '@atproto/api' -import {$Typed} from '@atproto/api/dist/client/util' import {TID} from '@atproto/common-web' import * as dcbor from '@ipld/dag-cbor' import {t} from '@lingui/macro' diff --git a/src/lib/generate-starterpack.ts b/src/lib/generate-starterpack.ts index f31485cef1..5137983c43 100644 --- a/src/lib/generate-starterpack.ts +++ b/src/lib/generate-starterpack.ts @@ -1,11 +1,11 @@ import { + $Typed, AppBskyActorDefs, AppBskyGraphGetStarterPack, BskyAgent, ComAtprotoRepoApplyWrites, Facet, } from '@atproto/api' -import {$Typed} from '@atproto/api/dist/client/util' import {msg} from '@lingui/macro' import {useLingui} from '@lingui/react' import {useMutation} from '@tanstack/react-query' diff --git a/src/screens/Messages/components/MessagesList.tsx b/src/screens/Messages/components/MessagesList.tsx index 3f3e99c031..10a2b1d378 100644 --- a/src/screens/Messages/components/MessagesList.tsx +++ b/src/screens/Messages/components/MessagesList.tsx @@ -10,8 +10,12 @@ import Animated, { } from 'react-native-reanimated' import {ReanimatedScrollEvent} from 'react-native-reanimated/lib/typescript/hook/commonTypes' import {useSafeAreaInsets} from 'react-native-safe-area-context' -import {AppBskyEmbedRecord, AppBskyRichtextFacet, RichText} from '@atproto/api' -import {$Typed} from '@atproto/api/dist/client/util' +import { + $Typed, + AppBskyEmbedRecord, + AppBskyRichtextFacet, + RichText, +} from '@atproto/api' import {clamp} from '#/lib/numbers' import {ScrollProvider} from '#/lib/ScrollContext' diff --git a/src/screens/Onboarding/util.ts b/src/screens/Onboarding/util.ts index 143671cb34..d14c9562e6 100644 --- a/src/screens/Onboarding/util.ts +++ b/src/screens/Onboarding/util.ts @@ -1,10 +1,10 @@ import { + $Typed, AppBskyGraphFollow, AppBskyGraphGetFollows, BskyAgent, ComAtprotoRepoApplyWrites, } from '@atproto/api' -import {$Typed} from '@atproto/api/dist/client/util' import {TID} from '@atproto/common-web' import chunk from 'lodash.chunk' diff --git a/src/screens/Settings/components/PwiOptOut.tsx b/src/screens/Settings/components/PwiOptOut.tsx index 3d236e906e..4596f6cda6 100644 --- a/src/screens/Settings/components/PwiOptOut.tsx +++ b/src/screens/Settings/components/PwiOptOut.tsx @@ -1,7 +1,6 @@ import React from 'react' import {View} from 'react-native' -import {ComAtprotoLabelDefs} from '@atproto/api' -import {$Typed} from '@atproto/api/dist/client/util' +import {$Typed,ComAtprotoLabelDefs} from '@atproto/api' import {msg, Trans} from '@lingui/macro' import {useLingui} from '@lingui/react' diff --git a/src/state/queries/list.ts b/src/state/queries/list.ts index f2bcaf3dc7..7aec4bc669 100644 --- a/src/state/queries/list.ts +++ b/src/state/queries/list.ts @@ -1,5 +1,6 @@ import {Image as RNImage} from 'react-native-image-crop-picker' import { + $Typed, AppBskyGraphDefs, AppBskyGraphGetList, AppBskyGraphList, @@ -8,7 +9,6 @@ import { ComAtprotoRepoApplyWrites, Facet, } from '@atproto/api' -import {$Typed} from '@atproto/api/dist/client/util' import {useMutation, useQuery, useQueryClient} from '@tanstack/react-query' import chunk from 'lodash.chunk' diff --git a/src/state/queries/postgate/util.ts b/src/state/queries/postgate/util.ts index d7c0d1b7d7..c1955cc74f 100644 --- a/src/state/queries/postgate/util.ts +++ b/src/state/queries/postgate/util.ts @@ -1,11 +1,11 @@ import { + $Typed, AppBskyEmbedRecord, AppBskyEmbedRecordWithMedia, AppBskyFeedDefs, AppBskyFeedPostgate, AtUri, } from '@atproto/api' -import {$Typed} from '@atproto/api/dist/client/util' export const POSTGATE_COLLECTION = 'app.bsky.feed.postgate' diff --git a/yarn.lock b/yarn.lock index 992ec8c621..285f9de286 100644 --- a/yarn.lock +++ b/yarn.lock @@ -58,15 +58,15 @@ resolved "https://registry.yarnpkg.com/@atproto-labs/simple-store/-/simple-store-0.1.1.tgz#e743a2722b5d8732166f0a72aca8bd10e9bff106" integrity sha512-WKILW2b3QbAYKh+w5U2x6p5FqqLl0nAeLwGeDY+KjX01K4Dq3vQTR9b/qNp0jZm48CabPQVrqCv0PPU9LgRRRg== -"@atproto/api@0.14.0-next.1": - version "0.14.0-next.1" - resolved "https://registry.yarnpkg.com/@atproto/api/-/api-0.14.0-next.1.tgz#26911122a0f1346cffdbdb716b05e2fc45fe058c" - integrity sha512-1MmJjCs00SEMiy2P4KEQ92ozkMG3L+kCiOQ90j/YicQCPiCuEdkgl3gYBRg6Hal2s1fncK7mZgvpk+btn3anzA== +"@atproto/api@0.14.0-next.2": + version "0.14.0-next.2" + resolved "https://registry.yarnpkg.com/@atproto/api/-/api-0.14.0-next.2.tgz#c42313217dc5cbbd81438706018963d4232a4ba6" + integrity sha512-1FADZQAklDozrGDxrb6ydkrlBBES4sKP7wJZTtwzqb1bSUOqRD8vjuvVvklt2ahhAQvslsBUC1wBrMa7VGS6hA== dependencies: - "@atproto/common-web" "^0.3.1" - "@atproto/lexicon" "^0.4.4" + "@atproto/common-web" "^0.3.2" + "@atproto/lexicon" "^0.4.5" "@atproto/syntax" "^0.3.1" - "@atproto/xrpc" "^0.6.5" + "@atproto/xrpc" "^0.6.6" await-lock "^2.2.2" multiformats "^9.9.0" tlds "^1.234.0" @@ -169,6 +169,16 @@ uint8arrays "3.0.0" zod "^3.23.8" +"@atproto/common-web@^0.3.2": + version "0.3.2" + resolved "https://registry.yarnpkg.com/@atproto/common-web/-/common-web-0.3.2.tgz#4cf78ad4d24fed801882f3d35afc39bceccdff51" + integrity sha512-Vx0JtL1/CssJbFAb0UOdvTrkbUautsDfHNOXNTcX2vyPIxH9xOameSqLLunM1hZnOQbJwyjmQCt6TV+bhnanDg== + dependencies: + graphemer "^1.4.0" + multiformats "^9.9.0" + uint8arrays "3.0.0" + zod "^3.23.8" + "@atproto/common@0.1.0": version "0.1.0" resolved "https://registry.yarnpkg.com/@atproto/common/-/common-0.1.0.tgz#4216a8fef5b985ab62ac21252a0f8ca0f4a0f210" @@ -283,6 +293,17 @@ multiformats "^9.9.0" zod "^3.23.8" +"@atproto/lexicon@^0.4.5": + version "0.4.5" + resolved "https://registry.yarnpkg.com/@atproto/lexicon/-/lexicon-0.4.5.tgz#4fcf3731193c674286e9e8d677bbab5dd530b817" + integrity sha512-fljWqMGKn+XWtTprBcS3F1hGBREnQYh6qYHv2sjENucc7REms1gtmZXSerB9N6pVeHVNOnXiILdukeAcic5OEw== + dependencies: + "@atproto/common-web" "^0.3.2" + "@atproto/syntax" "^0.3.1" + iso-datestring-validator "^2.2.2" + multiformats "^9.9.0" + zod "^3.23.8" + "@atproto/oauth-provider@^0.2.10": version "0.2.10" resolved "https://registry.yarnpkg.com/@atproto/oauth-provider/-/oauth-provider-0.2.10.tgz#f9820d7f82c33d3b74e81a75873f50e1e654b901" @@ -452,6 +473,14 @@ "@atproto/lexicon" "^0.4.4" zod "^3.23.8" +"@atproto/xrpc@^0.6.6": + version "0.6.6" + resolved "https://registry.yarnpkg.com/@atproto/xrpc/-/xrpc-0.6.6.tgz#28f58270ef4a8056f7f718bd52512e74bcd3702f" + integrity sha512-umXEYVMo9/pyIBoKmIAIi64RXDW9tSXY+wqztlQ6I2GZtjLfNZqmAWU+wADk3SxUe54mvjxxGyA4TtyGtDMfhA== + dependencies: + "@atproto/lexicon" "^0.4.5" + zod "^3.23.8" + "@aws-crypto/crc32@3.0.0": version "3.0.0" resolved "https://registry.yarnpkg.com/@aws-crypto/crc32/-/crc32-3.0.0.tgz#07300eca214409c33e3ff769cd5697b57fdd38fa"