chore: upgrade marked to v14

app/package.json

@@ -29,7 +29,8 @@
     "dayjs": "^1.11.13",
     "highlight.js": "^11.10.0",
     "lodash": "^4.17.21",
-    "marked": "^10.0.0",
+    "marked": "^14.1.2",
+    "marked-highlight": "^2.1.4",
     "nprogress": "^0.2.0",
     "pinia": "^2.2.4",
     "pinia-plugin-persistedstate": "^4.1.1",

app/src/components/ChatGPT/ChatGPT.vue

@@ -1,8 +1,9 @@
 <script setup lang="ts">
 import Icon, { SendOutlined } from '@ant-design/icons-vue'
 import { storeToRefs } from 'pinia'
-import { marked } from 'marked'
+import { Marked } from 'marked'
 import hljs from 'highlight.js'
+import { markedHighlight } from 'marked-highlight'
 import type { Ref } from 'vue'
 import { urlJoin } from '@/lib/helper'
 import { useSettingsStore, useUserStore } from '@/pinia'
@@ -158,17 +159,17 @@ async function send() {
   await request()
 }
 
-const renderer = new marked.Renderer()
+const marked = new Marked(
+  markedHighlight({
+    langPrefix: 'hljs language-',
+    highlight(code, lang) {
+      const language = hljs.getLanguage(lang) ? lang : 'nginx'
 
-renderer.code = (code, lang: string) => {
-  const language = hljs.getLanguage(lang) ? lang : 'nginx'
-  const highlightedCode = hljs.highlight(code, { language }).value
-
-  return `<pre><code class="hljs ${language}">${highlightedCode}</code></pre>`
-}
+      return hljs.highlight(code, { language }).value
+    },
+  }))
 
 marked.setOptions({
-  renderer,
   pedantic: false,
   gfm: true,
   breaks: false,

app/src/views/environment/BatchUpgrader.vue

@@ -40,7 +40,9 @@ function log(msg: string) {
 
   logContainer.value.appendChild(para)
 
-  logContainer.value.scroll({ top: 320, left: 0, behavior: 'smooth' })
+  nextTick(() => {
+    logContainer.value.scroll({ top: logContainer.value.scrollHeight, left: 0, behavior: 'smooth' })
+  })
 }
 
 const progressPercentComputed = computed(() => {