diff options
| author | dakkar <dakkar@thenautilus.net> | 2024-06-21 11:41:08 +0100 |
|---|---|---|
| committer | dakkar <dakkar@thenautilus.net> | 2024-06-21 11:41:08 +0100 |
| commit | 385ecc30a3a4cda0826d7345b7b9f6c4a5fcb9dc (patch) | |
| tree | 3c579e32045f8f56b80deb06ef01812ca9ebee66 /packages | |
| parent | select note component in <setup> (diff) | |
| download | sharkey-385ecc30a3a4cda0826d7345b7b9f6c4a5fcb9dc.tar.gz sharkey-385ecc30a3a4cda0826d7345b7b9f6c4a5fcb9dc.tar.bz2 sharkey-385ecc30a3a4cda0826d7345b7b9f6c4a5fcb9dc.zip | |
don't `await` in `<setup>`
`defineAsyncComponent` exists for exactly this purposeā¦
Diffstat (limited to 'packages')
| -rw-r--r-- | packages/frontend/src/components/MkNotes.vue | 11 | ||||
| -rw-r--r-- | packages/frontend/src/components/MkNotifications.vue | 11 | ||||
| -rw-r--r-- | packages/frontend/src/pages/favorites.vue | 10 | ||||
| -rw-r--r-- | packages/frontend/src/pages/note.vue | 11 | ||||
| -rw-r--r-- | packages/frontend/src/pages/user/home.vue | 9 |
5 files changed, 29 insertions, 23 deletions
diff --git a/packages/frontend/src/components/MkNotes.vue b/packages/frontend/src/components/MkNotes.vue index e9043995f5..15173fbd99 100644 --- a/packages/frontend/src/components/MkNotes.vue +++ b/packages/frontend/src/components/MkNotes.vue @@ -32,17 +32,18 @@ SPDX-License-Identifier: AGPL-3.0-only </template> <script lang="ts" setup> -import { shallowRef, ref } from 'vue'; +import { defineAsyncComponent, shallowRef, ref } from 'vue'; import MkDateSeparatedList from '@/components/MkDateSeparatedList.vue'; import MkPagination, { Paging } from '@/components/MkPagination.vue'; import { i18n } from '@/i18n.js'; import { infoImageUrl } from '@/instance.js'; import { defaultStore } from '@/store.js'; -const MkNote = ( - (defaultStore.state.noteDesign === 'misskey') ? (await import('@/components/MkNote.vue')).default : - (defaultStore.state.noteDesign === 'sharkey') ? (await import('@/components/SkNote.vue')).default : - null); +const MkNote = defineAsyncComponent(() => + (defaultStore.state.noteDesign === 'misskey') ? import('@/components/MkNote.vue') : + (defaultStore.state.noteDesign === 'sharkey') ? import('@/components/SkNote.vue') : + null +); const props = defineProps<{ pagination: Paging; diff --git a/packages/frontend/src/components/MkNotifications.vue b/packages/frontend/src/components/MkNotifications.vue index 76dcb5f58d..2dd6c21ef6 100644 --- a/packages/frontend/src/components/MkNotifications.vue +++ b/packages/frontend/src/components/MkNotifications.vue @@ -24,7 +24,7 @@ SPDX-License-Identifier: AGPL-3.0-only </template> <script lang="ts" setup> -import { onUnmounted, onDeactivated, onMounted, computed, shallowRef, onActivated } from 'vue'; +import { defineAsyncComponent, onUnmounted, onDeactivated, onMounted, computed, shallowRef, onActivated } from 'vue'; import MkPagination from '@/components/MkPagination.vue'; import XNotification from '@/components/MkNotification.vue'; import MkDateSeparatedList from '@/components/MkDateSeparatedList.vue'; @@ -36,10 +36,11 @@ import { defaultStore } from '@/store.js'; import MkPullToRefresh from '@/components/MkPullToRefresh.vue'; import * as Misskey from 'misskey-js'; -const MkNote = ( - (defaultStore.state.noteDesign === 'misskey') ? (await import('@/components/MkNote.vue')).default : - (defaultStore.state.noteDesign === 'sharkey') ? (await import('@/components/SkNote.vue')).default : - null); +const MkNote = defineAsyncComponent(() => + (defaultStore.state.noteDesign === 'misskey') ? import('@/components/MkNote.vue') : + (defaultStore.state.noteDesign === 'sharkey') ? import('@/components/SkNote.vue') : + null +); const props = defineProps<{ excludeTypes?: typeof notificationTypes[number][]; diff --git a/packages/frontend/src/pages/favorites.vue b/packages/frontend/src/pages/favorites.vue index a477dc7fcc..0af84dbed7 100644 --- a/packages/frontend/src/pages/favorites.vue +++ b/packages/frontend/src/pages/favorites.vue @@ -28,15 +28,17 @@ SPDX-License-Identifier: AGPL-3.0-only <script lang="ts" setup> import MkPagination from '@/components/MkPagination.vue'; import MkDateSeparatedList from '@/components/MkDateSeparatedList.vue'; +import { defineAsyncComponent } from 'vue'; import { i18n } from '@/i18n.js'; import { definePageMetadata } from '@/scripts/page-metadata.js'; import { infoImageUrl } from '@/instance.js'; import { defaultStore } from '@/store.js'; -const MkNote = ( - (defaultStore.state.noteDesign === 'misskey') ? (await import('@/components/MkNote.vue')).default : - (defaultStore.state.noteDesign === 'sharkey') ? (await import('@/components/SkNote.vue')).default : - null); +const MkNote = defineAsyncComponent(() => + (defaultStore.state.noteDesign === 'misskey') ? import('@/components/MkNote.vue') : + (defaultStore.state.noteDesign === 'sharkey') ? import('@/components/SkNote.vue') : + null +); const pagination = { endpoint: 'i/favorites' as const, diff --git a/packages/frontend/src/pages/note.vue b/packages/frontend/src/pages/note.vue index e8a7289b0b..141bacd526 100644 --- a/packages/frontend/src/pages/note.vue +++ b/packages/frontend/src/pages/note.vue @@ -48,7 +48,7 @@ SPDX-License-Identifier: AGPL-3.0-only </template> <script lang="ts" setup> -import { computed, watch, ref } from 'vue'; +import { defineAsyncComponent, computed, watch, ref } from 'vue'; import * as Misskey from 'misskey-js'; import type { Paging } from '@/components/MkPagination.vue'; import MkNotes from '@/components/MkNotes.vue'; @@ -61,10 +61,11 @@ import { dateString } from '@/filters/date.js'; import MkClipPreview from '@/components/MkClipPreview.vue'; import { defaultStore } from '@/store.js'; -const MkNoteDetailed = ( - (defaultStore.state.noteDesign === 'misskey') ? (await import('@/components/MkNoteDetailed.vue')).default : - (defaultStore.state.noteDesign === 'sharkey') ? (await import('@/components/SkNoteDetailed.vue')).default : - null); +const MkNote = defineAsyncComponent(() => + (defaultStore.state.noteDesign === 'misskey') ? import('@/components/MkNote.vue') : + (defaultStore.state.noteDesign === 'sharkey') ? import('@/components/SkNote.vue') : + null +); const props = defineProps<{ noteId: string; diff --git a/packages/frontend/src/pages/user/home.vue b/packages/frontend/src/pages/user/home.vue index b891fc6d2b..ccd1a691da 100644 --- a/packages/frontend/src/pages/user/home.vue +++ b/packages/frontend/src/pages/user/home.vue @@ -189,10 +189,11 @@ import { misskeyApi } from '@/scripts/misskey-api.js'; import { isFollowingVisibleForMe, isFollowersVisibleForMe } from '@/scripts/isFfVisibleForMe.js'; import { useRouter } from '@/router/supplier.js'; -const MkNote = ( - (defaultStore.state.noteDesign === 'misskey') ? (await import('@/components/MkNote.vue')).default : - (defaultStore.state.noteDesign === 'sharkey') ? (await import('@/components/SkNote.vue')).default : - null); +const MkNote = defineAsyncComponent(() => + (defaultStore.state.noteDesign === 'misskey') ? import('@/components/MkNote.vue') : + (defaultStore.state.noteDesign === 'sharkey') ? import('@/components/SkNote.vue') : + null +); function calcAge(birthdate: string): number { const date = new Date(birthdate); |