Merge branch 'main' into shuuji3/feat/emoji-reactions

# Conflicts:
#	app/components/status/StatusEmojiReaction.vue
#	shared/types/global.d.ts

app/components/account/AccountFollowButton.vue

@@ -1,6 +1,6 @@
 <script setup lang="ts">
 import type { mastodon } from 'masto'
-import { toggleFollowAccount, useRelationship } from '~~/composables/masto/relationship'
+import { toggleFollowAccount, useRelationship } from '~/composables/masto/relationship'
 
 const { account, context, command, ...props } = defineProps<{
   account: mastodon.v1.Account

app/components/account/AccountMoreButton.vue

@@ -1,6 +1,6 @@
 <script setup lang="ts">
 import type { mastodon } from 'masto'
-import { toggleBlockAccount, toggleBlockDomain, toggleMuteAccount } from '~~/composables/masto/relationship'
+import { toggleBlockAccount, toggleBlockDomain, toggleMuteAccount } from '~/composables/masto/relationship'
 
 const { account } = defineProps<{
   account: mastodon.v1.Account

app/components/account/AccountTabs.vue

@@ -1,5 +1,5 @@
 <script setup lang="ts">
-import type { CommonRouteTabOption } from '~/types'
+import type { CommonRouteTabOption } from '#shared/types'
 
 const { t } = useI18n()
 const route = useRoute()

app/components/common/CommonRouteTabs.vue

@@ -1,5 +1,5 @@
 <script setup lang="ts">
-import type { CommonRouteTabMoreOption, CommonRouteTabOption } from '~/types'
+import type { CommonRouteTabMoreOption, CommonRouteTabOption } from '#shared/types'
 
 const { options, command, preventScrollTop = false } = defineProps<{
   options: CommonRouteTabOption[]

app/components/modal/ModalConfirm.vue

@@ -1,5 +1,5 @@
 <script setup lang="ts">
-import type { ConfirmDialogChoice, ConfirmDialogOptions } from '~/types'
+import type { ConfirmDialogChoice, ConfirmDialogOptions } from '#shared/types'
 
 const { extraOptionType } = defineProps<ConfirmDialogOptions>()
 

app/components/modal/ModalContainer.vue

@@ -1,6 +1,6 @@
 <script setup lang="ts">
+import type { ConfirmDialogChoice } from '#shared/types'
 import type { mastodon } from 'masto'
-import type { ConfirmDialogChoice } from '~/types'
 import {
   isCommandPanelOpen,
   isConfirmDialogOpen,

app/components/modal/ModalError.vue

@@ -1,5 +1,5 @@
 <script setup lang="ts">
-import type { ErrorDialogData } from '~/types'
+import type { ErrorDialogData } from '#shared/types'
 
 defineProps<ErrorDialogData>()
 </script>

app/components/notification/NotificationGroupedFollow.vue

@@ -1,5 +1,5 @@
 <script setup lang="ts">
-import type { GroupedNotifications } from '~/types'
+import type { GroupedNotifications } from '#shared/types'
 
 const { items } = defineProps<{
   items: GroupedNotifications

app/components/notification/NotificationGroupedLikes.vue

@@ -1,5 +1,5 @@
 <script setup lang="ts">
-import type { GroupedLikeNotifications } from '~/types'
+import type { GroupedLikeNotifications } from '#shared/types'
 
 const { group } = defineProps<{
   group: GroupedLikeNotifications

app/components/notification/NotificationPaginator.vue

@@ -1,6 +1,6 @@
 <script setup lang="ts">
+import type { GroupedAccountLike, NotificationSlot } from '#shared/types'
 import type { mastodon } from 'masto'
-import type { GroupedAccountLike, NotificationSlot } from '~/types'
 // @ts-expect-error missing types
 import { DynamicScrollerItem } from 'vue-virtual-scroller'