Upgrade Lingui to v5 (#9905)

src/lib/api/index.ts

@@ -16,7 +16,7 @@ import {
 } from '@atproto/api'
 import {TID} from '@atproto/common-web'
 import * as dcbor from '@ipld/dag-cbor'
-import {t} from '@lingui/macro'
+import {t} from '@lingui/core/macro'
 import {type QueryClient} from '@tanstack/react-query'
 import {sha256} from 'js-sha256'
 import {CID} from 'multiformats/cid'

src/lib/generate-starterpack.ts

@@ -6,7 +6,7 @@ import {
   type ComAtprotoRepoApplyWrites,
   type Facet,
 } from '@atproto/api'
-import {msg} from '@lingui/macro'
+import {msg} from '@lingui/core/macro'
 import {useLingui} from '@lingui/react'
 import {useMutation} from '@tanstack/react-query'
 

src/lib/hooks/useAccountSwitcher.ts

@@ -1,5 +1,5 @@
 import {useCallback, useState} from 'react'
-import {msg} from '@lingui/macro'
+import {msg} from '@lingui/core/macro'
 import {useLingui} from '@lingui/react'
 
 import {logger} from '#/logger'

src/lib/hooks/useCleanError.ts

@@ -1,5 +1,5 @@
 import {useCallback} from 'react'
-import {msg} from '@lingui/macro'
+import {msg} from '@lingui/core/macro'
 import {useLingui} from '@lingui/react'
 
 type CleanedError = {

src/lib/hooks/useCreateSupportLink.ts

@@ -1,5 +1,5 @@
 import {useCallback} from 'react'
-import {msg} from '@lingui/macro'
+import {msg} from '@lingui/core/macro'
 import {useLingui} from '@lingui/react'
 
 import {useSession} from '#/state/session'

src/lib/hooks/useNotificationHandler.ts

@@ -1,7 +1,7 @@
 import {useEffect} from 'react'
 import * as Notifications from 'expo-notifications'
 import {AtUri} from '@atproto/api'
-import {msg} from '@lingui/macro'
+import {msg} from '@lingui/core/macro'
 import {useLingui} from '@lingui/react'
 import {CommonActions, useNavigation} from '@react-navigation/native'
 import {useQueryClient} from '@tanstack/react-query'

src/lib/hooks/useOpenComposer.tsx

@@ -1,5 +1,5 @@
 import {useMemo} from 'react'
-import {Trans} from '@lingui/macro'
+import {Trans} from '@lingui/react/macro'
 
 import {useRequireEmailVerification} from '#/lib/hooks/useRequireEmailVerification'
 import {useOpenComposer as useRootOpenComposer} from '#/state/shell/composer'

src/lib/hooks/useTimeAgo.ts

@@ -1,6 +1,6 @@
 import {useCallback} from 'react'
 import {type I18n} from '@lingui/core'
-import {defineMessage, msg, plural} from '@lingui/macro'
+import {defineMessage, msg, plural} from '@lingui/core/macro'
 import {useLingui} from '@lingui/react'
 import {differenceInSeconds} from 'date-fns'
 

src/lib/interests.ts

@@ -1,5 +1,5 @@
 import {useMemo} from 'react'
-import {msg} from '@lingui/macro'
+import {msg} from '@lingui/core/macro'
 import {useLingui} from '@lingui/react'
 
 export const interests = [

src/lib/media/picker.shared.ts

@@ -3,7 +3,7 @@ import {
   launchImageLibraryAsync,
   UIImagePickerPreferredAssetRepresentationMode,
 } from 'expo-image-picker'
-import {t} from '@lingui/macro'
+import {t} from '@lingui/core/macro'
 
 import {type ImageMeta} from '#/state/gallery'
 import * as Toast from '#/view/com/util/Toast'

src/lib/media/picker.tsx

@@ -2,7 +2,7 @@ import {type ImagePickerOptions, launchCameraAsync} from 'expo-image-picker'
 import ExpoImageCropTool, {
   type OpenCropperOptions,
 } from '@bsky.app/expo-image-crop-tool'
-import {t} from '@lingui/macro'
+import {t} from '@lingui/core/macro'
 
 export {
   openPicker,

src/lib/media/save-image.ios.ts

@@ -1,5 +1,5 @@
 import {useCallback} from 'react'
-import {msg} from '@lingui/macro'
+import {msg} from '@lingui/core/macro'
 import {useLingui} from '@lingui/react'
 
 import * as Toast from '#/components/Toast'

src/lib/media/save-image.ts

@@ -1,6 +1,6 @@
 import {useCallback} from 'react'
 import * as MediaLibrary from 'expo-media-library'
-import {msg} from '@lingui/macro'
+import {msg} from '@lingui/core/macro'
 import {useLingui} from '@lingui/react'
 
 import * as Toast from '#/components/Toast'

src/lib/media/video/upload.shared.ts

@@ -1,6 +1,6 @@
 import {type BskyAgent} from '@atproto/api'
 import {type I18n} from '@lingui/core'
-import {msg} from '@lingui/macro'
+import {msg} from '@lingui/core/macro'
 
 import {VIDEO_SERVICE_DID} from '#/lib/constants'
 import {UploadLimitError} from '#/lib/media/video/errors'

src/lib/media/video/upload.ts

@@ -1,7 +1,7 @@
 import {createUploadTask, FileSystemUploadType} from 'expo-file-system/legacy'
 import {type AppBskyVideoDefs, type BskyAgent} from '@atproto/api'
 import {type I18n} from '@lingui/core'
-import {msg} from '@lingui/macro'
+import {msg} from '@lingui/core/macro'
 import {nanoid} from 'nanoid/non-secure'
 
 import {AbortError} from '#/lib/async/cancelable'

src/lib/media/video/upload.web.ts

@@ -1,7 +1,6 @@
-import {type AppBskyVideoDefs} from '@atproto/api'
-import {type BskyAgent} from '@atproto/api'
+import {type AppBskyVideoDefs, type BskyAgent} from '@atproto/api'
 import {type I18n} from '@lingui/core'
-import {msg} from '@lingui/macro'
+import {msg} from '@lingui/core/macro'
 import {nanoid} from 'nanoid/non-secure'
 
 import {AbortError} from '#/lib/async/cancelable'

src/lib/moderation/useGlobalLabelStrings.ts

@@ -1,5 +1,5 @@
 import {useMemo} from 'react'
-import {msg} from '@lingui/macro'
+import {msg} from '@lingui/core/macro'
 import {useLingui} from '@lingui/react'
 
 export type GlobalLabelStrings = Record<

src/lib/moderation/useLabelBehaviorDescription.ts

@@ -2,7 +2,7 @@ import {
   type InterpretedLabelValueDefinition,
   type LabelPreference,
 } from '@atproto/api'
-import {msg} from '@lingui/macro'
+import {msg} from '@lingui/core/macro'
 import {useLingui} from '@lingui/react'
 
 export function useLabelBehaviorDescription(

src/lib/moderation/useModerationCauseDescription.ts

@@ -4,7 +4,7 @@ import {
   type ModerationCause,
   type ModerationCauseSource,
 } from '@atproto/api'
-import {msg} from '@lingui/macro'
+import {msg} from '@lingui/core/macro'
 import {useLingui} from '@lingui/react'
 
 import {sanitizeHandle} from '#/lib/strings/handles'

src/lib/sharing.ts

@@ -1,8 +1,7 @@
 import {Share} from 'react-native'
 // import * as Sharing from 'expo-sharing'
 import {setStringAsync} from 'expo-clipboard'
-// TODO: replace global i18n instance with one returned from useLingui -sfn
-import {t} from '@lingui/macro'
+import {t} from '@lingui/core/macro'
 
 import * as Toast from '#/view/com/util/Toast'
 import {IS_ANDROID, IS_IOS} from '#/env'

src/lib/strings/errors.ts

@@ -1,5 +1,5 @@
 import {XRPCError} from '@atproto/xrpc'
-import {t} from '@lingui/macro'
+import {t} from '@lingui/core/macro'
 
 export function cleanError(str: any): string {
   if (!str) {

src/lib/strings/time.ts

@@ -1,5 +1,5 @@
 import {type I18n} from '@lingui/core'
-import {msg} from '@lingui/macro'
+import {msg} from '@lingui/core/macro'
 
 export function niceDate(
   i18n: I18n,