feat: bump to latest vue 3.4.19

components/account/AccountHoverWrapper.vue

@@ -1,5 +1,8 @@
 <script setup lang="ts">
 import type { mastodon } from 'masto'
+import { fetchAccountByHandle } from '~/composables/cache'
+
+type WatcherType = [acc?: mastodon.v1.Account, h?: string, v?: boolean]
 
 defineOptions({
   inheritAttrs: false,
@@ -11,16 +14,54 @@ const props = defineProps<{
   disabled?: boolean
 }>()
 
-const account = computed(() => props.account || (props.handle ? useAccountByHandle(props.handle!) : undefined))
+const hoverCard = ref()
+const targetIsVisible = ref(false)
+const account = ref<mastodon.v1.Account | null | undefined>(props.account)
+
+useIntersectionObserver(
+  hoverCard,
+  ([{ intersectionRatio }]) => {
+    targetIsVisible.value = intersectionRatio <= 0.75
+  },
+)
+watch(
+  () => [props.account, props.handle, targetIsVisible.value] satisfies WatcherType,
+  ([newAccount, newHandle, newVisible], oldProps) => {
+    if (newAccount) {
+      account.value = newAccount
+      return
+    }
+
+    if (!newVisible)
+      return
+
+    if (newHandle) {
+      const [_oldAccount, oldHandle, _oldVisible] = oldProps ?? [undefined, undefined, false]
+      if (!oldHandle || newHandle !== oldHandle || !account.value) {
+        fetchAccountByHandle(newHandle).then((acc) => {
+          if (acc.acct === props.handle)
+            account.value = acc
+        })
+      }
+
+      return
+    }
+
+    account.value = undefined
+  }, { immediate: true, flush: 'post' },
+)
+
 const userSettings = useUserSettings()
 </script>
 
 <template>
-  <VMenu v-if="!disabled && account && !getPreferences(userSettings, 'hideAccountHoverCard')" placement="bottom-start" :delay="{ show: 500, hide: 100 }" v-bind="$attrs" :close-on-content-click="false">
-    <slot />
-    <template #popper>
-      <AccountHoverCard v-if="account" :account="account" />
-    </template>
-  </VMenu>
-  <slot v-else />
+  <div ref="hoverCard">
+    <VMenu v-if="!disabled && account && !getPreferences(userSettings, 'hideAccountHoverCard')" placement="bottom-start" :delay="{ show: 500, hide: 100 }" v-bind="$attrs" :close-on-content-click="false">
+      <slot />
+      <template #popper>
+        <AccountHoverCard v-if="account" :account="account" />
+      </template>
+    </VMenu>
+    <slot v-else />
+  </div>
 </template>

components/account/AccountTabs.vue

@@ -1,11 +1,11 @@
 <script setup lang="ts">
-import type { CommonRouteTabOption } from '../common/CommonRouteTabs.vue'
+import type { CommonRouteTabOption } from '~/types'
 
 const { t } = useI18n()
 const route = useRoute()
 
-const server = computedEager(() => route.params.server as string)
-const account = computedEager(() => route.params.account as string)
+const server = computed(() => route.params.server as string)
+const account = computed(() => route.params.account as string)
 
 const tabs = computed<CommonRouteTabOption[]>(() => [
   {

components/common/CommonPaginator.vue

@@ -94,8 +94,8 @@ defineExpose({ createEntry, removeEntry, updateEntry })
       </template>
       <template v-else>
         <slot
-          v-for="item, index of items"
-          v-bind="{ key: item[keyProp as keyof U] }"
+          v-for="(item, index) of items"
+          v-bind="{ key: (item as U)[keyProp as keyof U] }"
           :item="item as U"
           :older="items[index + 1] as U"
           :newer="items[index - 1] as U"

components/common/CommonRouteTabs.vue

@@ -1,5 +1,5 @@
 <script setup lang="ts">
-import type { RouteLocationRaw } from 'vue-router'
+import type { CommonRouteTabMoreOption, CommonRouteTabOption } from '~/types'
 
 const { options, command, replace, preventScrollTop = false, moreOptions } = defineProps<{
   options: CommonRouteTabOption[]
@@ -10,22 +10,6 @@ const { options, command, replace, preventScrollTop = false, moreOptions } = def
 }>()
 
 const { t } = useI18n()
-
-export interface CommonRouteTabOption {
-  to: RouteLocationRaw
-  display: string
-  disabled?: boolean
-  name?: string
-  icon?: string
-  hide?: boolean
-  match?: boolean
-}
-export interface CommonRouteTabMoreOption {
-  options: CommonRouteTabOption[]
-  icon?: string
-  tooltip?: string
-  match?: boolean
-}
 const router = useRouter()
 
 useCommands(() => command
@@ -60,7 +44,7 @@ useCommands(() => command
         <span ws-nowrap mxa sm:px2 sm:py3 py2 text-center text-secondary-light op50>{{ option.display }}</span>
       </div>
     </template>
-    <template v-if="moreOptions?.options?.length">
+    <template v-if="isHydrated && moreOptions?.options?.length">
       <CommonDropdown placement="bottom" flex cursor-pointer mx-1.25rem>
         <CommonTooltip placement="top" :content="moreOptions.tooltip || t('action.more')">
           <button

components/common/CommonTooltip.vue

@@ -10,6 +10,7 @@ defineProps<Props>()
 
 <template>
   <VTooltip
+    v-if="isHydrated"
     v-bind="$attrs"
     auto-hide
   >

components/magickeys/MagickeysKeyboardShortcuts.vue

@@ -24,7 +24,7 @@ interface ShortcutItemGroup {
 const isMac = useIsMac()
 const modifierKeyName = computed(() => isMac.value ? '⌘' : 'Ctrl')
 
-const shortcutItemGroups: ShortcutItemGroup[] = [
+const shortcutItemGroups = computed<ShortcutItemGroup[]>(() => [
   {
     name: t('magic_keys.groups.navigation.title'),
     items: [
@@ -79,7 +79,7 @@ const shortcutItemGroups: ShortcutItemGroup[] = [
     name: t('magic_keys.groups.media.title'),
     items: [],
   },
-]
+])
 </script>
 
 <template>

composables/cache.ts

@@ -91,10 +91,6 @@ export async function fetchAccountByHandle(acct: string): Promise<mastodon.v1.Ac
   return account
 }
 
-export function useAccountByHandle(acct: string) {
-  return useAsyncState(() => fetchAccountByHandle(acct), null).state
-}
-
 export function useAccountById(id?: string | null) {
   return useAsyncState(() => fetchAccountById(id), null).state
 }

composables/paginator.ts

@@ -13,7 +13,7 @@ export function usePaginator<T, P, U = T>(
   // so clone it
   const paginator = _paginator.clone()
 
-  const state = ref<PaginatorState>(isHydrated.value ? 'idle' : 'loading')
+  const state = shallowRef<PaginatorState>(isHydrated.value ? 'idle' : 'loading')
   const items = ref<U[]>([])
   const nextItems = ref<U[]>([])
   const prevItems = ref<T[]>([])

composables/users.ts

@@ -362,20 +362,20 @@ export function useUserLocalStorage<T extends object>(key: string, initial: () =
         // Backward compatibility, respect webDomain in acct
         // In previous versions, acct was username@server instead of username@webDomain
         // for example: [email protected] instead of [email protected]
-        // if (!all.value[id]) { // TODO: add back this condition in the future
-        const [username, webDomain] = id.split('@')
-        const server = currentServer.value
-        if (webDomain && server && server !== webDomain) {
-          const oldId = `${username}@${server}`
-          const outdatedSettings = all.value[oldId]
-          if (outdatedSettings) {
-            const newAllValue = { ...all.value, [id]: outdatedSettings }
-            delete newAllValue[oldId]
-            all.value = newAllValue
+        if (!all.value[id]) {
+          const [username, webDomain] = id.split('@')
+          const server = currentServer.value
+          if (webDomain && server && server !== webDomain) {
+            const oldId = `${username}@${server}`
+            const outdatedSettings = all.value[oldId]
+            if (outdatedSettings) {
+              const newAllValue = { ...all.value, [id]: outdatedSettings }
+              delete newAllValue[oldId]
+              all.value = newAllValue
+            }
           }
+          all.value[id] = Object.assign(initial(), all.value[id] || {})
         }
-        // }
-        all.value[id] = Object.assign(initial(), all.value[id] || {})
         return all.value[id]
       })
     })

nuxt.config.ts

@@ -12,7 +12,7 @@ export default defineNuxtConfig({
     tsConfig: {
       exclude: ['../service-worker'],
       vueCompilerOptions: {
-        target: 3.3,
+        target: 3.4,
       },
     },
   },
@@ -75,6 +75,11 @@ export default defineNuxtConfig({
       './composables/settings',
       './composables/tiptap/index.ts',
     ],
+    imports: [{
+      name: 'useI18n',
+      from: '~/utils/i18n',
+      priority: 100,
+    }],
     injectAtEnd: true,
   },
   vite: {
@@ -86,6 +91,20 @@ export default defineNuxtConfig({
     build: {
       target: 'esnext',
     },
+    optimizeDeps: {
+      include: [
+        '@tiptap/vue-3', 'string-length', 'vue-virtual-scroller', 'emoji-mart', 'iso-639-1',
+        '@tiptap/extension-placeholder', '@tiptap/extension-document', '@tiptap/extension-paragraph',
+        '@tiptap/extension-text', '@tiptap/extension-mention', '@tiptap/extension-hard-break',
+        '@tiptap/extension-bold', '@tiptap/extension-italic', '@tiptap/extension-code',
+        '@tiptap/extension-history', 'prosemirror-state', 'browser-fs-access', 'blurhash',
+        '@vueuse/integrations/useFocusTrap', '@tiptap/extension-code-block', 'prosemirror-highlight',
+        '@tiptap/core', 'tippy.js', 'prosemirror-highlight/shiki', '@fnando/sparkline',
+        '@vueuse/gesture', 'github-reserved-names', 'file-saver', 'slimeform', 'vue-advanced-cropper',
+        'workbox-window', 'workbox-precaching', 'workbox-routing', 'workbox-cacheable-response',
+        'workbox-strategies', 'workbox-expiration',
+      ],
+    },
   },
   postcss: {
     plugins: {

package.json

@@ -150,6 +150,9 @@
       "[email protected]": "patches/[email protected]"
     }
   },
+  "resolutions": {
+    "vue": "^3.4.19"
+  },
   "simple-git-hooks": {
     "pre-commit": "pnpm lint-staged"
   },

pages/[[server]]/@[account]/[status].vue

@@ -11,7 +11,7 @@ definePageMeta({
 })
 
 const route = useRoute()
-const id = computedEager(() => route.params.status as string)
+const id = computed(() => route.params.status as string)
 const main = ref<ComponentPublicInstance | null>(null)
 
 const { data: status, pending, refresh: refreshStatus } = useAsyncData(
@@ -71,7 +71,7 @@ onReactivated(() => {
         <div xl:mt-4 mb="50vh" border="b base">
           <template v-if="!pendingContext">
             <StatusCard
-              v-for="comment, i of context?.ancestors" :key="comment.id"
+              v-for="(comment, i) of context?.ancestors" :key="comment.id"
               :status="comment" :actions="comment.visibility !== 'direct'" context="account"
               :has-older="true" :newer="context?.ancestors[i - 1]"
             />

pages/[[server]]/@[account]/index.vue

@@ -4,7 +4,7 @@ definePageMeta({
 })
 
 const params = useRoute().params
-const accountName = computedEager(() => toShortHandle(params.account as string))
+const accountName = computed(() => toShortHandle(params.account as string))
 
 const { t } = useI18n()
 

pages/[[server]]/@[account]/index/followers.vue

@@ -1,7 +1,7 @@
 <script setup lang="ts">
 const { t } = useI18n()
 const params = useRoute().params
-const handle = computedEager(() => params.account as string)
+const handle = computed(() => params.account as string)
 
 definePageMeta({ name: 'account-followers' })
 

pages/[[server]]/@[account]/index/following.vue

@@ -1,7 +1,7 @@
 <script setup lang="ts">
 const { t } = useI18n()
 const params = useRoute().params
-const handle = computedEager(() => params.account as string)
+const handle = computed(() => params.account as string)
 
 definePageMeta({ name: 'account-following' })
 

pages/[[server]]/@[account]/index/index.vue

@@ -2,7 +2,7 @@
 import type { mastodon } from 'masto'
 
 const params = useRoute().params
-const handle = computedEager(() => params.account as string)
+const handle = computed(() => params.account as string)
 
 definePageMeta({ name: 'account-index' })
 

pages/[[server]]/@[account]/index/media.vue

@@ -3,7 +3,7 @@ definePageMeta({ name: 'account-media' })
 
 const { t } = useI18n()
 const params = useRoute().params
-const handle = computedEager(() => params.account as string)
+const handle = computed(() => params.account as string)
 
 const account = await fetchAccountByHandle(handle.value)
 

pages/[[server]]/@[account]/index/with_replies.vue

@@ -3,7 +3,7 @@ definePageMeta({ name: 'account-replies' })
 
 const { t } = useI18n()
 const params = useRoute().params
-const handle = computedEager(() => params.account as string)
+const handle = computed(() => params.account as string)
 
 const account = await fetchAccountByHandle(handle.value)
 

pages/[[server]]/explore.vue

@@ -1,5 +1,5 @@
 <script setup lang="ts">
-import type { CommonRouteTabOption } from '~/components/common/CommonRouteTabs.vue'
+import type { CommonRouteTabOption } from '~/types'
 
 const { t } = useI18n()
 

pages/[[server]]/explore/index.vue

@@ -17,5 +17,5 @@ useHydratedHead({
     <p>{{ $t('tooltip.explore_posts_intro') }}</p>
   </CommonAlert>
   <!-- TODO: Tabs for trending statuses, tags, and links -->
-  <TimelinePaginator :paginator="paginator" context="public" />
+  <TimelinePaginator v-if="isHydrated" :paginator="paginator" context="public" />
 </template>

pages/[[server]]/list/[list]/index.vue

@@ -1,5 +1,5 @@
 <script setup lang="ts">
-import type { CommonRouteTabOption } from '~/components/common/CommonRouteTabs.vue'
+import type { CommonRouteTabOption } from '~/types'
 
 definePageMeta({
   middleware: 'auth',
@@ -17,15 +17,15 @@ const tabs = computed<CommonRouteTabOption[]>(() => [
       name: 'list',
       params: { server: server.value, list: list.value },
     },
-    display: t('tab.posts'),
+    display: isHydrated.value ? t('tab.posts') : '',
     icon: 'i-ri:list-unordered',
   },
   {
     to: {
       name: 'list-accounts',
       params: { server: server.value, list: list.value },
     },
-    display: t('tab.accounts'),
+    display: isHydrated.value ? t('tab.accounts') : '',
     icon: 'i-ri:user-line',
   },
 ],

pages/[[server]]/list/[list]/index/accounts.vue

@@ -4,7 +4,7 @@ definePageMeta({
 })
 
 const params = useRoute().params
-const listId = computedEager(() => params.list as string)
+const listId = computed(() => params.list as string)
 
 const paginator = useMastoClient().v1.lists.$select(listId.value).accounts.list()
 </script>

pages/[[server]]/list/[list]/index/index.vue

@@ -4,7 +4,7 @@ definePageMeta({
 })
 
 const params = useRoute().params
-const listId = computedEager(() => params.list as string)
+const listId = computed(() => params.list as string)
 
 const client = useMastoClient()