Merge branch 'release/3.85.1'

Author: purocean

.github/workflows/release.yml

@@ -9,9 +9,9 @@ jobs:
     strategy:
       matrix:
         include:
-          - os: macos-13
+          - os: macos-15
             platform: 'mac'
-          - os: windows-2019
+          - os: windows-2022
             platform: 'win'
           - os: ubuntu-22.04
             platform: 'linux'
@@ -37,7 +37,7 @@ jobs:
       - name: Setup Node.js environment
         uses: actions/setup-node@v2.1.2
         with:
-          node-version: 18.x
+          node-version: 22.x
 
       - name: Install
         run: |

.node-version

@@ -1 +1 @@
-v18.20.2
+v22.21.1

README.md

@@ -13,7 +13,7 @@ English | [中文说明](./README_ZH-CN.md) | [Русский](./README_RU.md)
 ## Highlights
 
 - **Easy to use:** Use *Monaco* kernel, optimize for Markdown editing, and have the same editing experience as VSCode.
-- **Powerful:** Support version control; Applets, runnable code blocks, tables, PlantUML, Drawio, macro replacements, etc., can be embedded in the document; support for [OpenAI](https://openai.com) auto completion.
+- **Powerful:** Support version control; Applets, runnable code blocks, tables, PlantUML, Drawio, macro replacements, etc., can be embedded in the document; support for AI Copilot.
 - **High compatibility:** Data is saved as local Markdown files, and the extension functions are implemented in the original syntax of Markdown as far as possible.
 - **Plug-in extension:** Support users to write their own plug-ins to expand the functionality of the editor.
 - **Encryption supported:** Use encryption to save private files such as account number, and the password can be set separately for each file.
@@ -63,7 +63,7 @@ For more information on how to use the following functions, please see [characte
 - **Macro replacement:** support for embedded JavaScript expressions to dynamically replace document content
 - **Image hosting service:** support [PicGo](https://picgo.github.io/PicGo-Doc/) image hosting service
 - **OpenAI:** support for [OpenAI](https://openai.com) auto completion
-- **Custom plug-ins:** support writing JavaScript plug-ins to expand editor functionality. The plug-in is placed in the `home directory/plugins`. Refer to [plug-in Development Guide](./help/PLUGIN.md)
+- **Custom plug-ins:** support writing JavaScript plug-ins to #expand editor functionality. The plug-in is placed in the `home directory/plugins`. Refer to [plug-in Development Guide](./help/PLUGIN.md)
 
 ## Screenshots
 
@@ -76,14 +76,16 @@ For more information on how to use the following functions, please see [characte
 
 ## Changelogs
 
-### [v3.82.1](https://github.com/purocean/yn/releases/tag/v3.82.1) 2025-03-30
+### [v3.85.1](https://github.com/purocean/yn/releases/tag/v3.85.1) 2025-11-25
 
-[Windows](https://github.com/purocean/yn/releases/download/v3.82.1/Yank-Note-win-x64-3.82.1.exe) | [macOS arm64](https://github.com/purocean/yn/releases/download/v3.82.1/Yank-Note-mac-arm64-3.82.1.dmg) | [macOS x64](https://github.com/purocean/yn/releases/download/v3.82.1/Yank-Note-mac-x64-3.82.1.dmg) | [Linux AppImage](https://github.com/purocean/yn/releases/download/v3.82.1/Yank-Note-linux-x86_64-3.82.1.AppImage) | [Linux deb](https://github.com/purocean/yn/releases/download/v3.82.1/Yank-Note-linux-amd64-3.82.1.deb)
+[Windows](https://github.com/purocean/yn/releases/download/v3.85.1/Yank-Note-win-x64-3.85.1.exe) | [macOS arm64](https://github.com/purocean/yn/releases/download/v3.85.1/Yank-Note-mac-arm64-3.85.1.dmg) | [macOS x64](https://github.com/purocean/yn/releases/download/v3.85.1/Yank-Note-mac-x64-3.85.1.dmg) | [Linux AppImage](https://github.com/purocean/yn/releases/download/v3.85.1/Yank-Note-linux-x86_64-3.85.1.AppImage) | [Linux deb](https://github.com/purocean/yn/releases/download/v3.85.1/Yank-Note-linux-amd64-3.85.1.deb)
 
-1. feat: Added font configuration for the preview area
-2. feat: Restrict Markdown syntax suggestions in the editor from displaying within code fences
-3. fix: Fixed the issue where exported HTML headings were not highlighted correctly in some cases
-4. feat(plugin): Added the `ctx.editor.getLineLanguageId` method to retrieve the language ID of a specific line
+1. feat: Add an option to automatically insert spaces between Chinese and English in the settings
+3. feat: Optimize the settings panel interaction, add a suggested list for image storage directories, and add code highlighting to custom CSS styles
+2. feat: Improve the interaction of the quick filter, add character highlighting
+4. feat: Upgrade Electron to 38.7.1
+5. fix: Fix the incorrect error message location in the settings panel
+6. feat(plugin): Add the text highlighting utility `ctx.utils.createTextHighlighter`
 
 [More release notes](https://github.com/purocean/yn/releases)
 

README_RU.md

@@ -14,7 +14,7 @@
 ## Особенности
 
 - **Простота использования:** Используется ядро *Monaco*, оптимизированное для редактирования в формате Markdown, и возможности редактирования такие же, как у VSCode.
-- **Мощный:** Поддержка контроля версий; в документ можно встраивать апплеты, запускаемые блоки кода, таблицы, PlantUML, Drawio, макрозамены и т.д.; поддержка автодополнения [OpenAI](https://openai.com).
+- **Мощный:** Поддержка контроля версий; в документ можно встраивать апплеты, запускаемые блоки кода, таблицы, PlantUML, Drawio, макрозамены и т.д.; поддержка автодополнения AI Copilot.
 - **Высокая совместимость:** Данные сохраняются в виде локальных файлов Markdown, а функции расширения реализованы в оригинальном синтаксисе Markdown, насколько это возможно.
 - **Расширение плагинов:** Поддержка пользователей в написании собственных плагинов для расширения функциональности редактора.
 - **Поддержка шифрования:** Используйте шифрование для сохранения приватных файлов, таких как номер счета, а пароль может быть установлен отдельно для каждого файла.

README_ZH-CN.md

@@ -13,7 +13,7 @@
 ## 特色
 
 - **使用方便**：使用 Monaco 内核，专为 Markdown 优化，拥有和 VSCode 一样的编辑体验。
-- **功能强大**：支持历史版本回溯；可在文档中嵌入小工具、可运行的代码块、表格、PlantUML 图形、Drawio 图形、宏替换等；支持接入 [OpenAI](https://openai.com) 自动补全。
+- **功能强大**：支持历史版本回溯；可在文档中嵌入小工具、可运行的代码块、表格、PlantUML 图形、Drawio 图形、宏替换等；支持 AI Copilot。
 - **兼容性强**：数据保存为本地 Markdown 文件；拓展功能尽量用 Markdown 原有的语法实现。
 - **插件拓展**：支持用户编写自己的插件来拓展编辑器的功能。
 - **支持加密**：用来保存账号等隐私文件，文件可单独设置密码。
@@ -76,14 +76,16 @@
 
 ## 更新日志
 
-### [v3.82.1](https://github.com/purocean/yn/releases/tag/v3.82.1) 2025-03-30
+### [v3.85.1](https://github.com/purocean/yn/releases/tag/v3.85.1) 2025-11-25
 
-[Windows](https://github.com/purocean/yn/releases/download/v3.82.1/Yank-Note-win-x64-3.82.1.exe) | [macOS arm64](https://github.com/purocean/yn/releases/download/v3.82.1/Yank-Note-mac-arm64-3.82.1.dmg) | [macOS x64](https://github.com/purocean/yn/releases/download/v3.82.1/Yank-Note-mac-x64-3.82.1.dmg) | [Linux AppImage](https://github.com/purocean/yn/releases/download/v3.82.1/Yank-Note-linux-x86_64-3.82.1.AppImage) | [Linux deb](https://github.com/purocean/yn/releases/download/v3.82.1/Yank-Note-linux-amd64-3.82.1.deb)
+[Windows](https://github.com/purocean/yn/releases/download/v3.85.1/Yank-Note-win-x64-3.85.1.exe) | [macOS arm64](https://github.com/purocean/yn/releases/download/v3.85.1/Yank-Note-mac-arm64-3.85.1.dmg) | [macOS x64](https://github.com/purocean/yn/releases/download/v3.85.1/Yank-Note-mac-x64-3.85.1.dmg) | [Linux AppImage](https://github.com/purocean/yn/releases/download/v3.85.1/Yank-Note-linux-x86_64-3.85.1.AppImage) | [Linux deb](https://github.com/purocean/yn/releases/download/v3.85.1/Yank-Note-linux-amd64-3.85.1.deb)
 
-1. feat: 新增预览区字体配置
-2. feat: 限制编辑器的 Markdown 语法建议在代码围栏中不显示
-3. fix: 修复某些情况下导出的 HTML 标题高亮不正确问题
-4. feat(plugin): 增加 `ctx.editor.getLineLanguageId` 方法获取某行的语言ID
+1. feat: 设置中增加自动在中英文之间添加空格选项
+3. feat: 优化设置面板交互，图片存放目录增加建议列表，自定义 CSS 样式 增加代码高亮
+2. feat: 快捷筛选器交互，增加字符高亮
+4. feat: 升级 Electron 到 38.7.1
+5. fix: 修复设置面板错误提示位置不正确问题
+6. feat(plugin): 增加 `ctx.utils.createTextHighlighter` 文本高亮工具函数
 
 [更多发布说明](https://github.com/purocean/yn/releases)
 

help/FEATURES.md

@@ -70,6 +70,7 @@ Type '/' in the editor to get prompts
     *[W3C]:  World Wide Web Consortium
     The HTML specification is maintained by the W3C.
 + Wiki Link: Supports using `[[filename#anchor|display text]]` or `[[filename:line,column|display text]]` syntax to link documents, such as [[README#Highlights|Features]] [[README:3,4]]
++ Tags: #Markdown #Help
 
 ## Github Alerts
 
@@ -633,6 +634,7 @@ variable name | type | description
 `headingNumber` | `boolean` | whether to enable the page title serial number
 `wrapCode` | `boolean` | whether to enable code wrapping
 `enableMacro` | `boolean` | whether to enable macro replacement
+`tags` | `string[]` | 文档标签
 `define` | `Record<string, string>` | Macro definition, string replacing
 `defaultPreviewer` | `string` | The default previewer for the document, some extensions may provide a special preview interface. Such as *<a href="javascript: ctx.showExtensionManager('@yank-note/extension-reveal-js')">Reveal.js extension</a>*
 `mdOptions` | `Record<string, boolean>` | Markdown-it parse options

help/FEATURES_ZH-CN.md

@@ -71,6 +71,7 @@ define:
     *[W3C]:  World Wide Web Consortium
     The HTML specification is maintained by the W3C.
 + Wiki 链接：支持使用 `[[文件名#锚点|显示文本]]` 或 `[[文件名:行,列|显示文本]]` 语法来链接文档，如 [[README#Highlights|特色功能]] [[README:3,4]]
++ 标签：#Markdown #使用帮助
 
 ## Github Alerts
 
@@ -631,6 +632,7 @@ Yank Note 接入了 [OpenAI](https://openai.com)、[Google AI](https://ai.google
 `wrapCode` | `boolean` | 是否开启代码换行
 `enableMacro` | `boolean` | 是否开启宏替换
 `define` | `Record<string, string>` | 宏定义，定义文本替换
+`tags` | `string[]` | 文档标签
 `defaultPreviewer` | `string` | 文档默认的预览器，某些扩展可能提供特殊的预览界面。如 *<a href="javascript: ctx.showExtensionManager('@yank-note/extension-reveal-js')">Reveal.js 扩展</a>*
 `mdOptions` | `Record<string, boolean>` | Markdown-it 解析参数
 `mdOptions.html` | `boolean` | 开启 HTML 解析

package.json

@@ -1,6 +1,6 @@
 {
   "name": "yank.note",
-  "version": "3.82.1",
+  "version": "3.85.1",
   "description": "Yank Note: A highly extensible Markdown editor, designed for productivity.",
   "main": "dist/main/app.js",
   "license": "AGPL-3.0",
@@ -41,12 +41,12 @@
     "ip": "^1.1.9",
     "jsonrpc-bridge": "^0.0.4",
     "jsonwebtoken": "^9.0.0",
-    "koa": "^2.13.1",
+    "koa": "^2.16.2",
     "koa-body": "^4.2.0",
     "lodash": "^4.17.21",
     "mime": "^2.5.2",
     "mitt": "^2.1.0",
-    "node-pty": "^1.1.0-beta27",
+    "node-pty": "^1.1.0-beta39",
     "pako": "^2.0.4",
     "plantuml-pipe": "^1.4.0",
     "qrcode": "^1.5.3",
@@ -57,7 +57,7 @@
     "socks": "^2.8.3",
     "tar-stream": "^2.2.0",
     "transliteration": "^2.2.0",
-    "undici": "^6.21.1",
+    "undici": "^6.21.2",
     "uuid": "^9.0.0",
     "yaml": "^2.2.2",
     "yargs": "^15.3.1"
@@ -66,7 +66,7 @@
     "@commitlint/cli": "^16.2.4",
     "@commitlint/config-conventional": "^16.2.4",
     "@electron/notarize": "^2.1.0",
-    "@electron/rebuild": "^3.7.1",
+    "@electron/rebuild": "^4.0.1",
     "@json-editor/json-editor": "^2.5.4",
     "@types/adm-zip": "^0.4.34",
     "@types/async-lock": "^1.3.0",
@@ -106,8 +106,8 @@
     "crypto-js": "^4.2.0",
     "dexie": "^4.0.8",
     "dom-to-image": "^2.6.0",
-    "electron": "33.3.1",
-    "electron-builder": "^23.6.0",
+    "electron": "38.7.1",
+    "electron-builder": "^26.0.12",
     "eslint": "^8.57.0",
     "eslint-plugin-import": "^2.29.1",
     "eslint-plugin-node": "^11.1.0",
@@ -148,7 +148,7 @@
     "typescript": "^5.5.4",
     "utility-types": "^3.10.0",
     "viewerjs": "^1.11.6",
-    "vite": "^6.0.12",
+    "vite": "^6.1.6",
     "vue": "^3.5.13",
     "vue-tsc": "^2.2.0",
     "xterm": "^4.18.0",

src/main/app.ts

@@ -106,7 +106,7 @@ const hideWindow = () => {
   if (win) {
     win.hide()
     win.setSkipTaskbar(true)
-    isMacos && app.dock.hide()
+    isMacos && app.dock?.hide()
   }
 }
 
@@ -325,7 +325,7 @@ const showWindow = (showInCurrentWindow = true) => {
     const show = () => {
       if (win) {
         // macos need show in dock
-        isMacos && app.dock.show()
+        isMacos && app.dock?.show()
         win.setSkipTaskbar(false)
         win.show()
         win.focus()

src/main/server/plantuml.ts

@@ -66,7 +66,7 @@ async function getCacheData (key: string, gen: () => Promise<any>) {
 }
 
 export default async function (data: string): Promise<{ content: any, type: string }> {
-  const api: string = config.get('plantuml-api', 'local')
+  const api: string = config.get('plantuml-api', 'local') || 'local'
 
   if (api.startsWith('local')) {
     try {
@@ -99,7 +99,7 @@ export default async function (data: string): Promise<{ content: any, type: stri
   } else {
     const url = api.replace('{data}', plantumlBase64(data))
     const dispatcher = await getAction('get-proxy-dispatcher')(url)
-    let type = api.includes('/svg/') ? 'image/svg+xml' : 'image/png'
+    let type = api.includes('svg') ? 'image/svg+xml' : 'image/png'
 
     const cacheKey = getCacheKey(api, type, data)
     const content = await getCacheData(cacheKey, async () => {