diff --git a/eslint.config.mjs b/eslint.config.mjs
index fc4474642d..abfdd4a013 100644
--- a/eslint.config.mjs
+++ b/eslint.config.mjs
@@ -189,6 +189,18 @@ export default defineConfig(
*/
ignore: ['^#\/locale\/locales\/.+\/messages'],
}],
+ 'import-x/no-extraneous-dependencies': ['error', {
+ 'whitelist': [
+ // test files only
+ '@jest/globals',
+ // we only use a really simple util from this, and we know it will be present
+ 'expo-modules-core',
+ // this is a dep for @atproto/api, but we absolutely need them in sync, so just
+ // rely on the transient version
+ '@atproto/common-web',
+ ]
+ }],
+ 'import-x/no-nodejs-modules': 'error',
/**
* TypeScript-specific rules
diff --git a/jest/jestSetup.js b/jest/jestSetup.js
index f9bc36f6bf..6a6987c79d 100644
--- a/jest/jestSetup.js
+++ b/jest/jestSetup.js
@@ -9,6 +9,7 @@ jest.mock('@react-native-async-storage/async-storage', () =>
require('@react-native-async-storage/async-storage/jest/async-storage-mock'),
)
jest.mock('react-native/Libraries/EventEmitter/NativeEventEmitter', () => {
+ // eslint-disable-next-line import-x/no-nodejs-modules
const {EventEmitter} = require('events')
return {
__esModule: true,
diff --git a/jest/test-utils.tsx b/jest/test-utils.tsx
deleted file mode 100644
index 264b31fae5..0000000000
--- a/jest/test-utils.tsx
+++ /dev/null
@@ -1,23 +0,0 @@
-import {GestureHandlerRootView} from 'react-native-gesture-handler'
-import {SafeAreaProvider} from 'react-native-safe-area-context'
-import {render} from '@testing-library/react-native'
-
-import {ThemeProvider} from '../src/lib/ThemeContext'
-import {type RootStoreModel, RootStoreProvider} from '../src/state'
-
-const customRender = (ui: any, rootStore: RootStoreModel) =>
- render(
-
-
-
- {ui}
-
-
- ,
- )
-
-// re-export everything
-export * from '@testing-library/react-native'
-
-// override render method
-export {customRender as render}
diff --git a/package.json b/package.json
index 36f7ec6152..1871a8e0af 100644
--- a/package.json
+++ b/package.json
@@ -81,7 +81,7 @@
"icons:optimize": "svgo -f ./assets/icons"
},
"dependencies": {
- "@atproto/api": "^0.19.3",
+ "@atproto/api": "^0.19.5",
"@bitdrift/react-native": "^0.6.8",
"@braintree/sanitize-url": "^6.0.2",
"@bsky.app/alf": "^0.1.7",
diff --git a/src/components/ageAssurance/AgeAssuranceInitDialog.tsx b/src/components/ageAssurance/AgeAssuranceInitDialog.tsx
index bf79f5dfc4..15e3a2b472 100644
--- a/src/components/ageAssurance/AgeAssuranceInitDialog.tsx
+++ b/src/components/ageAssurance/AgeAssuranceInitDialog.tsx
@@ -1,6 +1,6 @@
import {useState} from 'react'
import {View} from 'react-native'
-import {XRPCError} from '@atproto/xrpc'
+import {XRPCError} from '@atproto/api'
import {msg} from '@lingui/core/macro'
import {useLingui} from '@lingui/react'
import {Trans} from '@lingui/react/macro'
diff --git a/src/components/dialogs/EmailDialog/events.ts b/src/components/dialogs/EmailDialog/events.ts
index 4fa171cad5..d2c3810208 100644
--- a/src/components/dialogs/EmailDialog/events.ts
+++ b/src/components/dialogs/EmailDialog/events.ts
@@ -1,5 +1,5 @@
import {useEffect} from 'react'
-import EventEmitter from 'eventemitter3'
+import {EventEmitter} from 'eventemitter3'
const events = new EventEmitter<{
emailVerified: void
diff --git a/src/components/moderation/LabelsOnMeDialog.tsx b/src/components/moderation/LabelsOnMeDialog.tsx
index c750079d1e..83fe2e4019 100644
--- a/src/components/moderation/LabelsOnMeDialog.tsx
+++ b/src/components/moderation/LabelsOnMeDialog.tsx
@@ -1,7 +1,7 @@
import {useCallback, useMemo, useState} from 'react'
import {View} from 'react-native'
import {type ComAtprotoLabelDefs, ToolsOzoneReportDefs} from '@atproto/api'
-import {XRPCError} from '@atproto/xrpc'
+import {XRPCError} from '@atproto/api'
import {msg} from '@lingui/core/macro'
import {useLingui} from '@lingui/react'
import {Trans} from '@lingui/react/macro'
diff --git a/src/geolocation/service.ts b/src/geolocation/service.ts
index 2d9285b676..ec34747284 100644
--- a/src/geolocation/service.ts
+++ b/src/geolocation/service.ts
@@ -1,5 +1,5 @@
import {useEffect, useState} from 'react'
-import EventEmitter from 'eventemitter3'
+import {EventEmitter} from 'eventemitter3'
import {networkRetry} from '#/lib/async/retry'
import {
diff --git a/src/lib/hooks/useNavigationDeduped.ts b/src/lib/hooks/useNavigationDeduped.ts
index 2448787bd3..19d0c1c34f 100644
--- a/src/lib/hooks/useNavigationDeduped.ts
+++ b/src/lib/hooks/useNavigationDeduped.ts
@@ -1,5 +1,5 @@
import {useMemo} from 'react'
-import {useNavigation} from '@react-navigation/core'
+import {useNavigation} from '@react-navigation/native'
import {useDedupe} from '#/lib/hooks/useDedupe'
import {type NavigationProp} from '#/lib/routes/types'
diff --git a/src/lib/hooks/useWebScrollRestoration.ts b/src/lib/hooks/useWebScrollRestoration.ts
index 5f60d5a592..bc79bc534e 100644
--- a/src/lib/hooks/useWebScrollRestoration.ts
+++ b/src/lib/hooks/useWebScrollRestoration.ts
@@ -1,5 +1,5 @@
import {useEffect, useMemo, useState} from 'react'
-import {type EventArg, useNavigation} from '@react-navigation/core'
+import {type EventArg, useNavigation} from '@react-navigation/native'
if ('scrollRestoration' in history) {
// Tell the brower not to mess with the scroll.
diff --git a/src/lib/media/manip.ts b/src/lib/media/manip.ts
index 6d66fea489..2be799e261 100644
--- a/src/lib/media/manip.ts
+++ b/src/lib/media/manip.ts
@@ -15,7 +15,6 @@ import {
import {manipulateAsync, SaveFormat} from 'expo-image-manipulator'
import * as MediaLibrary from 'expo-media-library'
import * as Sharing from 'expo-sharing'
-import {Buffer} from 'buffer'
import {POST_IMG_MAX} from '#/lib/constants'
import {logger} from '#/logger'
@@ -322,7 +321,12 @@ export async function saveBytesToDisk(
bytes: Uint8Array,
type: string,
) {
- const encoded = Buffer.from(bytes).toString('base64')
+ // ideally we'd use `bytes.toBase64()`, but that's only baseline newly available
+ let binary = ''
+ for (const byte of bytes) {
+ binary += String.fromCharCode(byte)
+ }
+ const encoded = btoa(binary)
return await saveToDevice(filename, encoded, type)
}
diff --git a/src/lib/strings/errors.ts b/src/lib/strings/errors.ts
index f3a91e58dd..5f56cccc4d 100644
--- a/src/lib/strings/errors.ts
+++ b/src/lib/strings/errors.ts
@@ -1,4 +1,4 @@
-import {XRPCError} from '@atproto/xrpc'
+import {XRPCError} from '@atproto/api'
import {t} from '@lingui/core/macro'
export function cleanError(str: any): string {
diff --git a/src/state/cache/post-shadow.ts b/src/state/cache/post-shadow.ts
index 0afa272c53..f01a7a081d 100644
--- a/src/state/cache/post-shadow.ts
+++ b/src/state/cache/post-shadow.ts
@@ -5,7 +5,7 @@ import {
type AppBskyFeedDefs,
} from '@atproto/api'
import {type QueryClient} from '@tanstack/react-query'
-import EventEmitter from 'eventemitter3'
+import {EventEmitter} from 'eventemitter3'
import {batchedUpdates} from '#/lib/batchedUpdates'
import {findAllPostsInQueryData as findAllPostsInBookmarksQueryData} from '#/state/queries/bookmarks/useBookmarksQuery'
diff --git a/src/state/cache/profile-shadow.ts b/src/state/cache/profile-shadow.ts
index 34422dc0c0..b8a6c58c35 100644
--- a/src/state/cache/profile-shadow.ts
+++ b/src/state/cache/profile-shadow.ts
@@ -1,7 +1,7 @@
import {useEffect, useMemo, useState} from 'react'
import {type AppBskyActorDefs, type AppBskyNotificationDefs} from '@atproto/api'
import {type QueryClient} from '@tanstack/react-query'
-import EventEmitter from 'eventemitter3'
+import {EventEmitter} from 'eventemitter3'
import {batchedUpdates} from '#/lib/batchedUpdates'
import {findAllProfilesInQueryData as findAllProfilesInActivitySubscriptionsQueryData} from '#/state/queries/activity-subscriptions'
diff --git a/src/state/events.ts b/src/state/events.ts
index dcd36464ec..2ab72465de 100644
--- a/src/state/events.ts
+++ b/src/state/events.ts
@@ -1,4 +1,4 @@
-import EventEmitter from 'eventemitter3'
+import {EventEmitter} from 'eventemitter3'
type UnlistenFn = () => void
diff --git a/src/state/global-gesture-events/index.tsx b/src/state/global-gesture-events/index.tsx
index 2f0d652210..4d3e9795dc 100644
--- a/src/state/global-gesture-events/index.tsx
+++ b/src/state/global-gesture-events/index.tsx
@@ -7,7 +7,7 @@ import {
type GestureUpdateEvent,
type PanGestureHandlerEventPayload,
} from 'react-native-gesture-handler'
-import EventEmitter from 'eventemitter3'
+import {EventEmitter} from 'eventemitter3'
export type GlobalGestureEvents = {
begin: GestureStateChangeEvent
diff --git a/src/state/messages/convo/agent.ts b/src/state/messages/convo/agent.ts
index d29049c872..b6c8ee2f16 100644
--- a/src/state/messages/convo/agent.ts
+++ b/src/state/messages/convo/agent.ts
@@ -5,8 +5,8 @@ import {
type ChatBskyConvoGetLog,
type ChatBskyConvoSendMessage,
} from '@atproto/api'
-import {XRPCError} from '@atproto/xrpc'
-import EventEmitter from 'eventemitter3'
+import {XRPCError} from '@atproto/api'
+import {EventEmitter} from 'eventemitter3'
import {nanoid} from 'nanoid/non-secure'
import {networkRetry} from '#/lib/async/retry'
diff --git a/src/state/messages/events/agent.ts b/src/state/messages/events/agent.ts
index e8404fd000..ce9518212b 100644
--- a/src/state/messages/events/agent.ts
+++ b/src/state/messages/events/agent.ts
@@ -1,5 +1,5 @@
import {type BskyAgent, type ChatBskyConvoGetLog} from '@atproto/api'
-import EventEmitter from 'eventemitter3'
+import {EventEmitter} from 'eventemitter3'
import {nanoid} from 'nanoid/non-secure'
import {networkRetry} from '#/lib/async/retry'
diff --git a/src/state/persisted/index.web.ts b/src/state/persisted/index.web.ts
index ff278b74be..35e796810d 100644
--- a/src/state/persisted/index.web.ts
+++ b/src/state/persisted/index.web.ts
@@ -1,4 +1,4 @@
-import EventEmitter from 'eventemitter3'
+import {EventEmitter} from 'eventemitter3'
import BroadcastChannel from '#/lib/broadcast'
import {logger} from '#/logger'
diff --git a/src/state/queries/notifications/unread.tsx b/src/state/queries/notifications/unread.tsx
index ce6e209386..bf7505f91b 100644
--- a/src/state/queries/notifications/unread.tsx
+++ b/src/state/queries/notifications/unread.tsx
@@ -12,7 +12,7 @@ import {
} from 'react'
import {AppState} from 'react-native'
import {useQueryClient} from '@tanstack/react-query'
-import EventEmitter from 'eventemitter3'
+import {EventEmitter} from 'eventemitter3'
import BroadcastChannel from '#/lib/broadcast'
import {resetBadgeCount} from '#/lib/notifications/notifications'
diff --git a/src/view/com/composer/text-input/textInputWebEmitter.ts b/src/view/com/composer/text-input/textInputWebEmitter.ts
index fb037cac2e..c889e12f57 100644
--- a/src/view/com/composer/text-input/textInputWebEmitter.ts
+++ b/src/view/com/composer/text-input/textInputWebEmitter.ts
@@ -1,3 +1,3 @@
-import EventEmitter from 'eventemitter3'
+import {EventEmitter} from 'eventemitter3'
export const textInputWebEmitter = new EventEmitter()
diff --git a/src/view/com/util/MainScrollProvider.tsx b/src/view/com/util/MainScrollProvider.tsx
index a49a798983..3038ad21e0 100644
--- a/src/view/com/util/MainScrollProvider.tsx
+++ b/src/view/com/util/MainScrollProvider.tsx
@@ -7,7 +7,7 @@ import {
withSpring,
} from 'react-native-reanimated'
import {useSafeAreaInsets} from 'react-native-safe-area-context'
-import EventEmitter from 'eventemitter3'
+import {EventEmitter} from 'eventemitter3'
import {ScrollProvider} from '#/lib/ScrollContext'
import {useMinimalShellMode} from '#/state/shell'
diff --git a/src/view/shell/desktop/RightNav.tsx b/src/view/shell/desktop/RightNav.tsx
index d50a4bb679..07ea25632a 100644
--- a/src/view/shell/desktop/RightNav.tsx
+++ b/src/view/shell/desktop/RightNav.tsx
@@ -3,7 +3,7 @@ import {View} from 'react-native'
import {msg} from '@lingui/core/macro'
import {useLingui} from '@lingui/react'
import {Trans} from '@lingui/react/macro'
-import {useNavigation} from '@react-navigation/core'
+import {useNavigation} from '@react-navigation/native'
import {FEEDBACK_FORM_URL, HELP_DESK_URL} from '#/lib/constants'
import {useKawaiiMode} from '#/state/preferences/kawaii'
diff --git a/src/view/shell/index.web.tsx b/src/view/shell/index.web.tsx
index a7f255570e..ce13986524 100644
--- a/src/view/shell/index.web.tsx
+++ b/src/view/shell/index.web.tsx
@@ -36,7 +36,7 @@ import {NoAccessScreen} from '#/ageAssurance/components/NoAccessScreen'
import {RedirectOverlay} from '#/ageAssurance/components/RedirectOverlay'
import {PassiveAnalytics} from '#/analytics/PassiveAnalytics'
import {FlatNavigator, RoutesContainer} from '#/Navigation'
-import {Composer} from './Composer.web'
+import {Composer} from './Composer'
import {DrawerContent} from './Drawer'
function ShellInner() {
diff --git a/yarn.lock b/yarn.lock
index 4a5d8dc52e..ca998282a7 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -20,46 +20,46 @@
"@jridgewell/gen-mapping" "^0.3.0"
"@jridgewell/trace-mapping" "^0.3.9"
-"@atproto/api@^0.19.3":
- version "0.19.3"
- resolved "https://registry.yarnpkg.com/@atproto/api/-/api-0.19.3.tgz#61de8d2e31abe9eb2b4c8f4ad124ed79d4a77e89"
- integrity sha512-G8YpBpRouHdTAIagi/QQIUZOhGd1jfBQWkJy9QfxAzjjEpPvaVOSk4e1S85QzGLm/xbzVONzGkmdtiOSfP6wVg==
+"@atproto/api@^0.19.5":
+ version "0.19.5"
+ resolved "https://registry.yarnpkg.com/@atproto/api/-/api-0.19.5.tgz#6388e5d6d3a1693fe04b5f37c705682bac8601d3"
+ integrity sha512-u6R5TecYJDO8l8QFN09AMuJASYnUkJ4HhYE5hg4/dha/z14a+OAil2/dli/208uM5AHPFLtlnB8kIK9XU5GgQQ==
dependencies:
- "@atproto/common-web" "^0.4.18"
+ "@atproto/common-web" "^0.4.19"
"@atproto/lexicon" "^0.6.2"
- "@atproto/syntax" "^0.5.0"
+ "@atproto/syntax" "^0.5.2"
"@atproto/xrpc" "^0.7.7"
await-lock "^2.2.2"
multiformats "^9.9.0"
tlds "^1.234.0"
zod "^3.23.8"
-"@atproto/common-web@^0.4.18":
- version "0.4.18"
- resolved "https://registry.yarnpkg.com/@atproto/common-web/-/common-web-0.4.18.tgz#832976340457afd3d29345ad2c6f0ac0bff087dd"
- integrity sha512-ilImzP+9N/mtse440kN60pGrEzG7wi4xsV13nGeLrS+Zocybc/ISOpKlbZM13o+twPJ+Q7veGLw9CtGg0GAFoQ==
+"@atproto/common-web@^0.4.18", "@atproto/common-web@^0.4.19":
+ version "0.4.19"
+ resolved "https://registry.yarnpkg.com/@atproto/common-web/-/common-web-0.4.19.tgz#bbd7f84f545ebe73ca3bc00314ccf4ee66e7069e"
+ integrity sha512-3BTi58p5WpT+9/zb6UZrdsXcfPo5P45UJm0E4iwHLILr+jc37CuBj9JReDSZ4U0i9RTrI3ZkfySyZ9bd+LnMsw==
dependencies:
- "@atproto/lex-data" "^0.0.13"
- "@atproto/lex-json" "^0.0.13"
- "@atproto/syntax" "^0.5.0"
+ "@atproto/lex-data" "^0.0.14"
+ "@atproto/lex-json" "^0.0.14"
+ "@atproto/syntax" "^0.5.1"
zod "^3.23.8"
-"@atproto/lex-data@^0.0.13":
- version "0.0.13"
- resolved "https://registry.yarnpkg.com/@atproto/lex-data/-/lex-data-0.0.13.tgz#db1bcfa12d5056210f6eb7f3b8bac909909d6b9c"
- integrity sha512-7Z7RwZ1Y/JzBF/Tcn/I4UJ/vIGfh5zn1zjv0KX+flke2JtgFkSE8uh2hOtqgBQMNqE3zdJFM+dcSWln86hR3MQ==
+"@atproto/lex-data@^0.0.14":
+ version "0.0.14"
+ resolved "https://registry.yarnpkg.com/@atproto/lex-data/-/lex-data-0.0.14.tgz#2f2f3c64699925a0d4785e5afd0e7731ba1d46c0"
+ integrity sha512-53DUa9664SS76nGAMYopWsO10OH0AAdf7P/HSKB6Wzx3iqe6lk/K61QZnKxOG1LreYl5CfvIJU6eNf4txI6GlQ==
dependencies:
multiformats "^9.9.0"
tslib "^2.8.1"
uint8arrays "3.0.0"
unicode-segmenter "^0.14.0"
-"@atproto/lex-json@^0.0.13":
- version "0.0.13"
- resolved "https://registry.yarnpkg.com/@atproto/lex-json/-/lex-json-0.0.13.tgz#b0081f786aeeb1707087318fb03c928e75c19059"
- integrity sha512-hwLhkKaIHulGJpt0EfXAEWdrxqM2L1tV/tvilzhMp3QxPqYgXchFnrfVmLsyFDx6P6qkH1GsX/XC2V36U0UlPQ==
+"@atproto/lex-json@^0.0.14":
+ version "0.0.14"
+ resolved "https://registry.yarnpkg.com/@atproto/lex-json/-/lex-json-0.0.14.tgz#717e533ab583aa5f580acb2a77d9aa3e7eddaa17"
+ integrity sha512-6lPkDKqe7teEu4WrN5q7400cvZKgYS3uwUMvzG3F9XkgVYhOwSDCtouV/nSLBbpvo3l9OP0kiigtclcNcyekww==
dependencies:
- "@atproto/lex-data" "^0.0.13"
+ "@atproto/lex-data" "^0.0.14"
tslib "^2.8.1"
"@atproto/lexicon@^0.6.0", "@atproto/lexicon@^0.6.2":
@@ -73,10 +73,10 @@
multiformats "^9.9.0"
zod "^3.23.8"
-"@atproto/syntax@^0.5.0":
- version "0.5.0"
- resolved "https://registry.yarnpkg.com/@atproto/syntax/-/syntax-0.5.0.tgz#061ef538aee784f8e5fa1ea50a7f5beb4c276c9b"
- integrity sha512-UA2DSpGdOQzUQ4gi5SH+NEJz/YR3a3Fg3y2oh+xETDSiTRmA4VhHRCojhXAVsBxUT6EnItw190C/KN+DWW90kw==
+"@atproto/syntax@^0.5.0", "@atproto/syntax@^0.5.1", "@atproto/syntax@^0.5.2":
+ version "0.5.2"
+ resolved "https://registry.yarnpkg.com/@atproto/syntax/-/syntax-0.5.2.tgz#d4b32c9feb421ceeb5ade1fa80bc42764d51e52e"
+ integrity sha512-W41szOnkppoHr0iCUrzL8gy3OD6qmDyp1UvUgmTx2oFQfgbudpz51T/gznesiCcqiUT5obfHdx4PJ+WdlEOE7Q==
dependencies:
tslib "^2.8.1"