From 490222fb78196738a351614b4566c5b30fc703a7 Mon Sep 17 00:00:00 2001 From: syuilo <4439005+syuilo@users.noreply.github.com> Date: Sat, 29 Mar 2025 15:33:19 +0900 Subject: perf(frontend): avoid needless AsyncComponentWrapper --- packages/frontend/src/boot/common.ts | 4 ++-- packages/frontend/src/boot/main-boot.ts | 12 ++++++------ packages/frontend/src/boot/sub-boot.ts | 5 ++--- 3 files changed, 10 insertions(+), 11 deletions(-) (limited to 'packages/frontend/src/boot') 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) { +export async function common(createVue: () => Promise>) { console.info(`Misskey v${version}`); if (_DEV_) { @@ -263,7 +263,7 @@ export async function common(createVue: () => App) { }); }); - 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(); } -- cgit v1.2.3-freya From 4f4cb6738ce47b499c49e76d7b13e427625bc0ac Mon Sep 17 00:00:00 2001 From: syuilo <4439005+syuilo@users.noreply.github.com> Date: Sun, 30 Mar 2025 14:25:56 +0900 Subject: fix(frontend): drop classic ui --- CHANGELOG.md | 3 + packages/frontend/src/boot/main-boot.ts | 3 - packages/frontend/src/navbar.ts | 7 - packages/frontend/src/ui/classic.header.vue | 212 ----------------- packages/frontend/src/ui/classic.sidebar.vue | 245 -------------------- packages/frontend/src/ui/classic.vue | 326 --------------------------- 6 files changed, 3 insertions(+), 793 deletions(-) delete mode 100644 packages/frontend/src/ui/classic.header.vue delete mode 100644 packages/frontend/src/ui/classic.sidebar.vue delete mode 100644 packages/frontend/src/ui/classic.vue (limited to 'packages/frontend/src/boot') diff --git a/CHANGELOG.md b/CHANGELOG.md index 463b60769f..0268127cbe 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -51,6 +51,9 @@ - Enhance 全体的なパフォーマンス向上 - Fix: 読み込み直後にスクロールしようとすると途中で止まる場合があるのを修正 - Fix: テーマ切り替え時に一部の色が変わらない問題を修正 +- NOTE: 構造上クラシックUIを新しいデザインシステムに移行することが困難なため、クラシックUIが削除されました + - デッキUIでカラムを中央寄せにし、メインカラムの左右にウィジェットカラムを配置することである程度クラシックUIを再現できます + - また、デッキでナビゲーションバーを上部に表示するオプションを実装予定です ### Server - Enhance 全体的なパフォーマンス向上 diff --git a/packages/frontend/src/boot/main-boot.ts b/packages/frontend/src/boot/main-boot.ts index 224c441beb..fad6ce3825 100644 --- a/packages/frontend/src/boot/main-boot.ts +++ b/packages/frontend/src/boot/main-boot.ts @@ -54,9 +54,6 @@ export async function mainBoot() { case 'visitor': rootComponent = await import('@/ui/visitor.vue').then(x => x.default); break; - case 'classic': - rootComponent = await import('@/ui/classic.vue').then(x => x.default); - break; default: rootComponent = await import('@/ui/universal.vue').then(x => x.default); break; diff --git a/packages/frontend/src/navbar.ts b/packages/frontend/src/navbar.ts index 82e59bc7d6..185d9e81b7 100644 --- a/packages/frontend/src/navbar.ts +++ b/packages/frontend/src/navbar.ts @@ -145,13 +145,6 @@ export const navbarItemDef = reactive({ miLocalStorage.setItem('ui', 'deck'); unisonReload(); }, - }, { - text: i18n.ts.classic, - active: ui === 'classic', - action: () => { - miLocalStorage.setItem('ui', 'classic'); - unisonReload(); - }, }], ev.currentTarget ?? ev.target); }, }, diff --git a/packages/frontend/src/ui/classic.header.vue b/packages/frontend/src/ui/classic.header.vue deleted file mode 100644 index 7d4235bd4e..0000000000 --- a/packages/frontend/src/ui/classic.header.vue +++ /dev/null @@ -1,212 +0,0 @@ - - - - - - - diff --git a/packages/frontend/src/ui/classic.sidebar.vue b/packages/frontend/src/ui/classic.sidebar.vue deleted file mode 100644 index 43d24da28b..0000000000 --- a/packages/frontend/src/ui/classic.sidebar.vue +++ /dev/null @@ -1,245 +0,0 @@ - - - - - - - diff --git a/packages/frontend/src/ui/classic.vue b/packages/frontend/src/ui/classic.vue deleted file mode 100644 index c984cde342..0000000000 --- a/packages/frontend/src/ui/classic.vue +++ /dev/null @@ -1,326 +0,0 @@ - - - - - - - -- cgit v1.2.3-freya