Merge pull request #617 from Hi-Windom/v0.28

V0.28

.gitattributes

@@ -4,4 +4,5 @@ app/src/asset/pdf/** linguist-vendored
 *.yml linguist-language=shell
 *.bat linguist-language=shell
 *.json linguist-language=shell
-*.mdx linguist-language=astro
+*.mdx linguist-language=astro
+*.md linguist-language=html

.github/CONTRIBUTING.md

@@ -16,10 +16,10 @@ Install pnpm: `npm install -g pnpm`
 
 Set the Electron mirror environment variable and install Electron:
 
-* macOS/Linux: `ELECTRON_MIRROR=https://npmmirror.com/mirrors/electron/ pnpm install [email protected].4 -D`
+* macOS/Linux: `ELECTRON_MIRROR=https://npmmirror.com/mirrors/electron/ pnpm install [email protected].10 -D`
 * Windows:
     * `SET ELECTRON_MIRROR=https://npmmirror.com/mirrors/electron/`
-    * `pnpm install [email protected].4 -D`
+    * `pnpm install [email protected].10 -D`
 
 NPM mirror:
 
@@ -30,7 +30,7 @@ NPM mirror:
 
 On the desktop, go to the app folder to run:
 
-* `pnpm install [email protected].4 -D`
+* `pnpm install [email protected].10 -D`
 * `pnpm run dev`
 * `pnpm run start`
 

.github/CONTRIBUTING_zh_CN.md

@@ -18,11 +18,11 @@
 
 * macOS/Linux: 
  ```
- ELECTRON_MIRROR=https://npmmirror.com/mirrors/electron/ pnpm install [email protected].4 -D
+ ELECTRON_MIRROR=https://npmmirror.com/mirrors/electron/ pnpm install [email protected].10 -D
  ```
 * Windows:
     * `SET ELECTRON_MIRROR=https://npmmirror.com/mirrors/electron/`
-    * `pnpm install [email protected].4 -D`
+    * `pnpm install [email protected].10 -D`
 
 NPM 镜像：
 
@@ -32,7 +32,7 @@ NPM 镜像：
 
 桌面端进入 app 文件夹运行：
 
-* `pnpm install [email protected].4 -D`
+* `pnpm install [email protected].10 -D`
 * `pnpm run dev`
 * `pnpm run start`
 

.github/workflows/cd.yml

@@ -83,7 +83,7 @@ jobs:
       - name: Gather SiYuan Release Information
         id: release_info_siyuan
         run: |
-          changelog=$(python scripts/parse-changelog.py -t v${{ steps.syv.outputs.value }} -b v${{ steps.sypv.outputs.value }} siyuan-note/siyuan)
+          changelog=$(python scripts/parse-changelog.py -t v${{ steps.syv.outputs.value }} -a "${{ steps.sypv.outputs.value }}" siyuan-note/siyuan)
           EOF=$(dd if=/dev/urandom bs=15 count=1 status=none | base64)
           echo "release_body_siyuan<<$EOF" >> $GITHUB_ENV
           echo "$changelog" >> $GITHUB_ENV

.gitignore

@@ -39,12 +39,7 @@ package-lock.json
 yarn.lock
 
 # Sillot extend
-/.history
+**/.history
 /app/jestCD
 /app/out
 /app/dist-electron
-# copy to out for sillot-bridge gitmodule
-/app/package/app
-
-# subtree
-/astro

.vscode/README.MD

@@ -0,0 +1,19 @@
+## extensions.json
+
+`extensions.json` 文件用于在工作区级别推荐所需的 VSCode 扩展（插件）。这些推荐扩展会在打开工作区时显示给用户，以便他们轻松地安装和管理项目特定的工具。
+
+## launch.json
+
+`launch.json` 文件是工作区的调试配置文件，它定义了如何启动和调试项目。通过配置不同的启动配置，开发者可以设置程序参数、环境变量、调试器类型等，以适应不同的调试场景和需求。
+
+## settings.json
+
+`settings.json` 文件允许在工作区级别自定义 VSCode 编辑器的行为。这些设置可以覆盖用户级别的默认设置，允许每个项目根据特定的需求和偏好进行配置，例如代码格式化规则、编辑器选项、终端配置等。
+
+## Sillot.code-profile
+
+`Sillot.code-profile` 是一个特定于汐洛的配置文件，它包含了用户的设置、键盘快捷方式、用户任务和 UI 状态等个性化配置。这个文件不应用于管理扩展（插件），而是应该通过工作区中各个虚拟项目下的 `extensions.json` 文件来统一配置扩展建议。
+
+## Sillot.code-workspace
+
+`Sillot.code-workspace` 文件是汐洛工作区的配置文件，它用于定义工作区范围的结构和设置。这包括对工作区内包含的虚拟项目的引用，以及适用于整个工作区的通用设置。通过工作区文件，可以创建一个多项目环境，并在不同项目之间共享一些共同的配置，同时保持项目特定的设置分离。

.vscode/Sillot.code-workspace

@@ -0,0 +1,37 @@
+{
+	"folders": [
+		{
+			"path": "..",
+            "name": "汐洛🤍/ 🗂️"
+		},
+		{
+			"path": "../kernel", // 列出子文件夹，在父文件夹的 setting.json 添加隐藏（排除）
+            "name": "思源内核🤍/kernel 🗂️"
+		},
+		{
+			"path": "../app/appearance", // 列出子文件夹，在父文件夹的 setting.json 添加隐藏（排除）
+            "name": "思源美化🤍/app/appearance 🗂️"
+		},
+		{
+			"path": "../_sili", // 列出子文件夹，在父文件夹的 setting.json 添加隐藏（排除）
+            "name": "司丽🤍/_sili 🗂️"
+		},
+		{
+			"path": "../docs", // 列出子文件夹，在父文件夹的 setting.json 添加隐藏（排除）
+            "name": "汐洛宝典🤍/docs 🗂️"
+		},
+        {
+			"path": "../../Sillot-android", // 开发在 Android Studio 完成，这里列出只是方便 Git 管理
+            "name": "汐洛安卓🤍../Sillot-android 🗂️"
+		},
+	],
+	"settings": {
+		"files.associations": {
+			"*.sy": "json"
+		},
+		"workbench.editor.wrapTabs": true,
+        "search.exclude": {
+          "**/.history": true
+        }
+	}
+}

.vscode/extensions.json

@@ -1,32 +1,49 @@
 {
-  "recommendations": [
-    "editorconfig.editorconfig",
-    "mqycn.huile8",
-    "codeinchinese.chineseinputassistant",
-    "russell.any-rule",
-    "mrcrowl.easy-less",
-    "igorsbitnev.error-gutters",
-    "usernamehw.errorlens",
-    "mkxml.vscode-filesize",
-    "mhutchie.git-graph",
-    "donjayamanne.githistory",
-    "michelemelluso.gitignore",
-    "eamodio.gitlens",
-    "ldez.ignore-files",
-    "wix.vscode-import-cost",
-    "josee9988.minifyall",
-    "christian-kohler.npm-intellisense",
-    "leizongmin.node-module-intellisense",
-    "christian-kohler.path-intellisense",
-    "rome.rome",
-    "tyriar.vscode-terminal-here",
-    "symbolk.somanyconflicts",
-    "shardulm94.trailing-spaces",
-    "xboxyan.tree-generator",
-    "unifiedjs.vscode-mdx",
-    "astro-build.astro-vscode",
-    "golang.go",
-    "github.vscode-github-actions"
-  ],
-  "unwantedRecommendations": []
+    "recommendations": [
+        "editorconfig.editorconfig",
+        "mqycn.huile8",
+        "codeinchinese.chineseinputassistant",
+        "russell.any-rule",
+        "mrcrowl.easy-less",
+        "igorsbitnev.error-gutters",
+        "usernamehw.errorlens",
+        "mkxml.vscode-filesize",
+        "mhutchie.git-graph",
+        "donjayamanne.githistory",
+        "michelemelluso.gitignore",
+        "eamodio.gitlens",
+        "ldez.ignore-files",
+        "wix.vscode-import-cost",
+        "josee9988.minifyall",
+        "christian-kohler.npm-intellisense",
+        "leizongmin.node-module-intellisense",
+        "christian-kohler.path-intellisense",
+        "rome.rome",
+        "tyriar.vscode-terminal-here",
+        "symbolk.somanyconflicts",
+        "shardulm94.trailing-spaces",
+        "xboxyan.tree-generator",
+        "unifiedjs.vscode-mdx",
+        "astro-build.astro-vscode",
+        "golang.go",
+        "github.vscode-github-actions",
+        "maixiaojie.git-emoji-zh",
+        "doggy8088.pangu2",
+        "ms-ceintl.vscode-language-pack-zh-hans",
+        "cweijan.vscode-office",
+    ],
+    "unwantedRecommendations": [
+        "hayden.extension-pack-manager",
+        "vscjava.vscode-java-pack",
+        "vscjava.vscode-gradle",
+        "googlecloudtools.cloudcode",
+        "github.copilot",
+        "ms-kubernetes-tools.vscode-kubernetes-tools",
+        "firefox-devtools.vscode-firefox-debug",
+        "felipecaputo.git-project-manager",
+        "dbaeumer.vscode-eslint",
+        "oderwat.indent-rainbow",
+        "esbenp.prettier-vscode",
+        "rvest.vs-code-prettier-eslint"
+    ],
 }

.vscode/settings.json

@@ -1,7 +1,11 @@
 {
   "vue.features.codeActions.enable": false,
-  "files.associations": {
-    "*.sy": "json"
+  "deno.enable": false,
+  "files.exclude": {
+    "_sili": true,
+    "docs": true,
+    "kernel": true,
+    "app/appearance": true
   },
-  "workbench.editor.wrapTabs": true
+  "editor.formatOnSave": false,
 }