diff --git a/packages/frontend-embed/package.json b/packages/frontend-embed/package.json index 6af553e745..800beb14d5 100644 --- a/packages/frontend-embed/package.json +++ b/packages/frontend-embed/package.json @@ -27,7 +27,7 @@ "punycode.js": "2.3.1", "rollup": "4.54.0", "sass": "1.97.1", - "shiki": "3.20.0", + "shiki": "3.21.0", "tinycolor2": "1.6.0", "uuid": "13.0.0", "vite": "7.3.0", diff --git a/packages/frontend/package.json b/packages/frontend/package.json index 38d861a31f..f9dab22cc9 100644 --- a/packages/frontend/package.json +++ b/packages/frontend/package.json @@ -25,6 +25,7 @@ "@rollup/plugin-replace": "6.0.3", "@rollup/pluginutils": "5.3.0", "@sentry/vue": "10.32.1", + "@shikijs/transformers": "3.21.0", "@syuilo/aiscript": "1.2.1", "@syuilo/aiscript-0-19-0": "npm:@syuilo/aiscript@^0.19.0", "@twemoji/parser": "16.0.0", @@ -43,6 +44,7 @@ "compare-versions": "6.1.1", "cropperjs": "2.1.0", "date-fns": "4.1.0", + "diff": "8.0.3", "eventemitter3": "5.0.1", "execa": "9.6.1", "exifreader": "4.33.1", @@ -67,12 +69,11 @@ "rollup": "4.54.0", "sanitize-html": "2.17.0", "sass": "1.97.1", - "shiki": "3.20.0", + "shiki": "3.21.0", "textarea-caret": "3.1.0", "three": "0.182.0", "throttle-debounce": "5.0.2", "tinycolor2": "1.6.0", - "v-code-diff": "1.13.1", "vite": "7.3.0", "vue": "3.5.26", "wanakana": "5.3.1" diff --git a/packages/frontend/src/components/MkCode.core.vue b/packages/frontend/src/components/MkCode.core.vue index f669e4b87a..eddd25be66 100644 --- a/packages/frontend/src/components/MkCode.core.vue +++ b/packages/frontend/src/components/MkCode.core.vue @@ -9,29 +9,40 @@ SPDX-License-Identifier: AGPL-3.0-only :class="[$style.codeBlockRoot, { [$style.codeEditor]: codeEditor, [$style.outerStyle]: !codeEditor && withOuterStyle, + [$style.withMaxHeight]: maxHeight != null, [$style.dark]: darkMode, [$style.light]: !darkMode, }]" v-html="html"> + + diff --git a/packages/frontend/src/pages/admin/modlog.ModLog.vue b/packages/frontend/src/pages/admin/modlog.ModLog.vue index 40c7b0b1b4..6a97a4303b 100644 --- a/packages/frontend/src/pages/admin/modlog.ModLog.vue +++ b/packages/frontend/src/pages/admin/modlog.ModLog.vue @@ -131,22 +131,29 @@ SPDX-License-Identifier: AGPL-3.0-only -
+
{{ i18n.ts.moderator }}: @{{ log.user?.username }}
{{ i18n.ts.dateAndTime }}:
@@ -229,7 +277,7 @@ SPDX-License-Identifier: AGPL-3.0-only