diff --git a/package.json b/package.json index 4eed6de06f..b3d08b83a9 100644 --- a/package.json +++ b/package.json @@ -77,6 +77,7 @@ "@bitdrift/react-native": "^0.6.8", "@braintree/sanitize-url": "^6.0.2", "@bsky.app/alf": "^0.1.6", + "@bsky.app/expo-image-crop-tool": "^0.5.0", "@bsky.app/react-native-mmkv": "2.12.5", "@discord/bottom-sheet": "bluesky-social/react-native-bottom-sheet", "@emoji-mart/react": "^1.1.1", @@ -145,7 +146,6 @@ "expo-font": "~14.0.10", "expo-haptics": "~15.0.8", "expo-image": "~3.0.11", - "expo-image-crop-tool": "^0.4.0", "expo-image-manipulator": "~14.0.8", "expo-image-picker": "~17.0.9", "expo-intent-launcher": "~13.0.8", @@ -165,6 +165,7 @@ "expo-updates": "~29.0.14", "expo-video": "~3.0.15", "expo-web-browser": "~15.0.10", + "fast-deep-equal": "^3.1.3", "fast-text-encoding": "^1.0.6", "history": "^5.3.0", "hls.js": "^1.6.2", @@ -174,7 +175,6 @@ "libphonenumber-js": "^1.12.31", "lodash.chunk": "^4.2.0", "lodash.debounce": "^4.0.8", - "fast-deep-equal": "^3.1.3", "lodash.shuffle": "^4.2.0", "lodash.throttle": "^4.1.1", "multiformats": "9.9.0", diff --git a/src/lib/media/picker.e2e.tsx b/src/lib/media/picker.e2e.tsx index 037c906a4c..bca72de3c8 100644 --- a/src/lib/media/picker.e2e.tsx +++ b/src/lib/media/picker.e2e.tsx @@ -3,7 +3,9 @@ import { getInfoAsync, readDirectoryAsync, } from 'expo-file-system/legacy' -import ExpoImageCropTool, {type OpenCropperOptions} from 'expo-image-crop-tool' +import ExpoImageCropTool, { + type OpenCropperOptions, +} from '@bsky.app/expo-image-crop-tool' import {compressIfNeeded} from './manip' import {type PickerImage} from './picker.shared' diff --git a/src/lib/media/picker.tsx b/src/lib/media/picker.tsx index 1f2be03181..8284d73fb3 100644 --- a/src/lib/media/picker.tsx +++ b/src/lib/media/picker.tsx @@ -1,5 +1,7 @@ -import ExpoImageCropTool, {type OpenCropperOptions} from 'expo-image-crop-tool' import {type ImagePickerOptions, launchCameraAsync} from 'expo-image-picker' +import ExpoImageCropTool, { + type OpenCropperOptions, +} from '@bsky.app/expo-image-crop-tool' import {t} from '@lingui/macro' export { diff --git a/src/lib/media/picker.web.tsx b/src/lib/media/picker.web.tsx index 233600583b..060169ff89 100644 --- a/src/lib/media/picker.web.tsx +++ b/src/lib/media/picker.web.tsx @@ -1,4 +1,4 @@ -import {type OpenCropperOptions} from 'expo-image-crop-tool' +import {type OpenCropperOptions} from '@bsky.app/expo-image-crop-tool' import {type PickerImage} from './picker.shared' import {type CameraOpts} from './types' diff --git a/src/lib/strings/errors.ts b/src/lib/strings/errors.ts index d69d60bcdc..a706597144 100644 --- a/src/lib/strings/errors.ts +++ b/src/lib/strings/errors.ts @@ -64,7 +64,7 @@ export function isErrorMaybeAppPasswordPermissions(e: unknown) { /** * Intended to capture "User cancelled" or "Crop cancelled" errors - * that we often get from expo modules such expo-image-crop-tool + * that we often get from expo modules such @bsky.app/expo-image-crop-tool * * The exact name has changed in the past so let's just see if the string * contains "cancel" diff --git a/yarn.lock b/yarn.lock index 9c3baf231c..1760ffb295 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3615,6 +3615,11 @@ dependencies: react-responsive "^10.0.1" +"@bsky.app/expo-image-crop-tool@^0.5.0": + version "0.5.0" + resolved "https://registry.yarnpkg.com/@bsky.app/expo-image-crop-tool/-/expo-image-crop-tool-0.5.0.tgz#4308fbde5c15e6be9122601797bc3d9549c95e31" + integrity sha512-gmhQr2HWTRFyPO00fn5OmtiEVtikXusHMrN5Zoq26pu1VZX3zVE+aoc668etTqrvsQcm2Qu8fo96k5F3Wu+6wg== + "@bsky.app/react-native-mmkv@2.12.5": version "2.12.5" resolved "https://registry.yarnpkg.com/@bsky.app/react-native-mmkv/-/react-native-mmkv-2.12.5.tgz#eb17d31a6158c74393f617a1763ac223ff3f83a6" @@ -11198,11 +11203,6 @@ expo-haptics@~15.0.8: resolved "https://registry.yarnpkg.com/expo-haptics/-/expo-haptics-15.0.8.tgz#f93f895ac5d76fe0c5ac26b3644e1dbb097833f3" integrity sha512-lftutojy8Qs8zaDzzjwM3gKHFZ8bOOEZDCkmh2Ddpe95Ra6kt2izeOfOfKuP/QEh0MZ1j9TfqippyHdRd1ZM9g== -expo-image-crop-tool@^0.4.0: - version "0.4.0" - resolved "https://registry.yarnpkg.com/expo-image-crop-tool/-/expo-image-crop-tool-0.4.0.tgz#c376b0695e8b2bf6b38fff5595ce30aaf9cddd64" - integrity sha512-2KZI016tb2i0yb0ZRMdH8h1I4YofD78fG/l6KrQTFzy4DtKaQlmJwU2VSJ8AYV5/nxusbHxgro7RQnr1BQ5lJg== - expo-image-loader@~6.0.0: version "6.0.0" resolved "https://registry.yarnpkg.com/expo-image-loader/-/expo-image-loader-6.0.0.tgz#15230442cbb90e101c080a4c81e37d974e43e072"