merge: make DynamicNote less dynamic - helps with #1059 (!1041)

View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/1041

Approved-by: Hazelnoot <acomputerdog@gmail.com>
Approved-by: Marie <github@yuugi.dev>

6 files changed, 20 insertions, 19 deletions

diff --git a/packages/frontend-embed/package.json b/packages/frontend-embed/package.json
index 658a9f732d..1a851df49b 100644
--- a/packages/frontend-embed/package.json
+++ b/packages/frontend-embed/package.json
@@ -18,7 +18,7 @@
 		"@transfem-org/sfm-js": "0.24.5",
 		"@twemoji/parser": "15.1.1",
 		"@vitejs/plugin-vue": "5.2.3",
-		"@vue/compiler-sfc": "3.5.12",
+		"@vue/compiler-sfc": "3.5.14",
 		"astring": "1.9.0",
 		"buraha": "0.0.1",
 		"estree-walker": "3.0.3",
@@ -35,7 +35,7 @@
 		"typescript": "5.8.3",
 		"uuid": "11.1.0",
 		"vite": "6.3.3",
-		"vue": "3.5.12"
+		"vue": "3.5.14"
 	},
 	"devDependencies": {
 		"@misskey-dev/summaly": "5.2.1",
@@ -49,7 +49,7 @@
 		"@typescript-eslint/eslint-plugin": "8.31.0",
 		"@typescript-eslint/parser": "8.31.0",
 		"@vitest/coverage-v8": "3.1.2",
-		"@vue/runtime-core": "3.5.12",
+		"@vue/runtime-core": "3.5.14",
 		"acorn": "8.14.1",
 		"cross-env": "7.0.3",
 		"eslint-plugin-import": "2.31.0",
diff --git a/packages/frontend/package.json b/packages/frontend/package.json
index a20aba0201..f5c7bcf1b4 100644
--- a/packages/frontend/package.json
+++ b/packages/frontend/package.json
@@ -30,7 +30,7 @@
 		"@transfem-org/sfm-js": "0.24.6",
 		"@twemoji/parser": "15.1.1",
 		"@vitejs/plugin-vue": "5.2.3",
-		"@vue/compiler-sfc": "3.5.12",
+		"@vue/compiler-sfc": "3.5.14",
 		"aiscript-vscode": "github:aiscript-dev/aiscript-vscode#v0.1.15",
 		"astring": "1.9.0",
 		"broadcast-channel": "7.1.0",
@@ -76,7 +76,7 @@
 		"uuid": "11.1.0",
 		"v-code-diff": "1.13.1",
 		"vite": "6.3.3",
-		"vue": "3.5.12",
+		"vue": "3.5.14",
 		"vuedraggable": "next",
 		"wanakana": "5.3.1"
 	},
@@ -119,8 +119,8 @@
 		"@typescript-eslint/eslint-plugin": "8.31.0",
 		"@typescript-eslint/parser": "8.31.0",
 		"@vitest/coverage-v8": "3.1.2",
-		"@vue/compiler-core": "3.5.12",
-		"@vue/runtime-core": "3.5.12",
+		"@vue/compiler-core": "3.5.14",
+		"@vue/runtime-core": "3.5.14",
 		"acorn": "8.14.1",
 		"cross-env": "7.0.3",
 		"eslint-plugin-import": "2.31.0",
diff --git a/packages/frontend/src/components/DynamicNote.vue b/packages/frontend/src/components/DynamicNote.vue
index a5008e9ddf..67707bfda9 100644
--- a/packages/frontend/src/components/DynamicNote.vue
+++ b/packages/frontend/src/components/DynamicNote.vue
@@ -23,10 +23,10 @@ import type MkNote from '@/components/MkNote.vue';
 import type SkNote from '@/components/SkNote.vue';
 import { prefer } from '@/preferences';
 
-const XNote = computed(() =>
-	prefer.r.noteDesign.value === 'misskey'
-		? defineAsyncComponent(() => import('@/components/MkNote.vue'))
-		: defineAsyncComponent(() => import('@/components/SkNote.vue')),
+const XNote = defineAsyncComponent(() =>
+	prefer.s.noteDesign === 'misskey'
+	? import('@/components/MkNote.vue')
+	: import('@/components/SkNote.vue')
 );
 
 const rootEl = useTemplateRef<ComponentExposed<typeof MkNote | typeof SkNote>>('rootEl');
diff --git a/packages/frontend/src/components/DynamicNoteDetailed.vue b/packages/frontend/src/components/DynamicNoteDetailed.vue
index 21bf00ccbe..8594db2328 100644
--- a/packages/frontend/src/components/DynamicNoteDetailed.vue
+++ b/packages/frontend/src/components/DynamicNoteDetailed.vue
@@ -20,10 +20,10 @@ import type MkNoteDetailed from '@/components/MkNoteDetailed.vue';
 import type SkNoteDetailed from '@/components/SkNoteDetailed.vue';
 import { prefer } from '@/preferences';
 
-const XNoteDetailed = computed(() =>
-	prefer.r.noteDesign.value === 'misskey'
-		? defineAsyncComponent(() => import('@/components/MkNoteDetailed.vue'))
-		: defineAsyncComponent(() => import('@/components/SkNoteDetailed.vue')),
+const XNoteDetailed = defineAsyncComponent(() =>
+	prefer.s.noteDesign === 'misskey'
+	? import('@/components/MkNoteDetailed.vue')
+	: import('@/components/SkNoteDetailed.vue'),
 );
 
 const rootEl = useTemplateRef<ComponentExposed<typeof MkNoteDetailed | typeof SkNoteDetailed>>('rootEl');
diff --git a/packages/frontend/src/components/DynamicNoteSimple.vue b/packages/frontend/src/components/DynamicNoteSimple.vue
index 7ca345ccfa..5eaeaf6c23 100644
--- a/packages/frontend/src/components/DynamicNoteSimple.vue
+++ b/packages/frontend/src/components/DynamicNoteSimple.vue
@@ -21,10 +21,10 @@ import type MkNoteSimple from '@/components/MkNoteSimple.vue';
 import type SkNoteSimple from '@/components/SkNoteSimple.vue';
 import { prefer } from '@/preferences';
 
-const XNoteSimple = computed(() =>
-	prefer.r.noteDesign.value === 'misskey'
-		? defineAsyncComponent(() => import('@/components/MkNoteSimple.vue'))
-		: defineAsyncComponent(() => import('@/components/SkNoteSimple.vue')),
+const XNoteSimple = defineAsyncComponent(() =>
+	prefer.s.noteDesign === 'misskey'
+	? import('@/components/MkNoteSimple.vue')
+	: import('@/components/SkNoteSimple.vue'),
 );
 
 const rootEl = useTemplateRef<ComponentExposed<typeof MkNoteSimple | typeof SkNoteSimple>>('rootEl');
diff --git a/packages/frontend/src/pages/settings/preferences.vue b/packages/frontend/src/pages/settings/preferences.vue
index a537b6e837..bb32a0ec43 100644
--- a/packages/frontend/src/pages/settings/preferences.vue
+++ b/packages/frontend/src/pages/settings/preferences.vue
@@ -1106,6 +1106,7 @@ watch([
 	fontSize,
 	useSystemFont,
 	makeEveryTextElementsSelectable,
+	noteDesign,
 ], async () => {
 	await reloadAsk({ reason: i18n.ts.reloadToApplySetting, unison: true });
 });