summaryrefslogtreecommitdiff
path: root/packages
diff options
context:
space:
mode:
Diffstat (limited to 'packages')
-rw-r--r--packages/frontend/src/boot/common.ts4
-rw-r--r--packages/frontend/src/boot/main-boot.ts12
-rw-r--r--packages/frontend/src/boot/sub-boot.ts5
3 files changed, 10 insertions, 11 deletions
diff --git a/packages/frontend/src/boot/common.ts b/packages/frontend/src/boot/common.ts
index 9a505ca9f8..7a88b938dd 100644
--- a/packages/frontend/src/boot/common.ts
+++ b/packages/frontend/src/boot/common.ts
@@ -29,7 +29,7 @@ import { fetchCustomEmojis } from '@/custom-emojis.js';
import { prefer } from '@/preferences.js';
import { $i } from '@/i.js';
-export async function common(createVue: () => App<Element>) {
+export async function common(createVue: () => Promise<App<Element>>) {
console.info(`Misskey v${version}`);
if (_DEV_) {
@@ -263,7 +263,7 @@ export async function common(createVue: () => App<Element>) {
});
});
- const app = createVue();
+ const app = await createVue();
if (_DEV_) {
app.config.performance = true;
diff --git a/packages/frontend/src/boot/main-boot.ts b/packages/frontend/src/boot/main-boot.ts
index bac7128603..224c441beb 100644
--- a/packages/frontend/src/boot/main-boot.ts
+++ b/packages/frontend/src/boot/main-boot.ts
@@ -32,7 +32,7 @@ import { signout } from '@/signout.js';
import { migrateOldSettings } from '@/pref-migrate.js';
export async function mainBoot() {
- const { isClientUpdated, lastVersion } = await common(() => {
+ const { isClientUpdated, lastVersion } = await common(async () => {
let uiStyle = ui;
const searchParams = new URLSearchParams(window.location.search);
@@ -46,19 +46,19 @@ export async function mainBoot() {
let rootComponent: Component;
switch (uiStyle) {
case 'zen':
- rootComponent = defineAsyncComponent(() => import('@/ui/zen.vue'));
+ rootComponent = await import('@/ui/zen.vue').then(x => x.default);
break;
case 'deck':
- rootComponent = defineAsyncComponent(() => import('@/ui/deck.vue'));
+ rootComponent = await import('@/ui/deck.vue').then(x => x.default);
break;
case 'visitor':
- rootComponent = defineAsyncComponent(() => import('@/ui/visitor.vue'));
+ rootComponent = await import('@/ui/visitor.vue').then(x => x.default);
break;
case 'classic':
- rootComponent = defineAsyncComponent(() => import('@/ui/classic.vue'));
+ rootComponent = await import('@/ui/classic.vue').then(x => x.default);
break;
default:
- rootComponent = defineAsyncComponent(() => import('@/ui/universal.vue'));
+ rootComponent = await import('@/ui/universal.vue').then(x => x.default);
break;
}
diff --git a/packages/frontend/src/boot/sub-boot.ts b/packages/frontend/src/boot/sub-boot.ts
index e24c324dfb..036142bc4d 100644
--- a/packages/frontend/src/boot/sub-boot.ts
+++ b/packages/frontend/src/boot/sub-boot.ts
@@ -6,11 +6,10 @@
import { createApp, defineAsyncComponent } from 'vue';
import { common } from './common.js';
import { emojiPicker } from '@/utility/emoji-picker.js';
+import UiMinimum from '@/ui/minimum.vue';
export async function subBoot() {
- const { isClientUpdated } = await common(() => createApp(
- defineAsyncComponent(() => import('@/ui/minimum.vue')),
- ));
+ const { isClientUpdated } = await common(async () => createApp(UiMinimum));
emojiPicker.init();
}