Skip to content

Commit

Permalink
Merge pull request #848 from Hi-Windom/v0.35
Browse files Browse the repository at this point in the history 
V0.35
  • Loading branch information
@Soltus
Soltus authored Jun 27, 2024
2 parents 13ab6bc + 04c6d04 commit efbac9f
Show file tree
Hide file tree
Showing 21 changed files with 134 additions and 164 deletions.
6 changes: 3 additions & 3 deletions .github/CONTRIBUTING.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,10 @@ Install pnpm: `npm install -g [email protected]`

Set the Electron mirror environment variable and install Electron:

* macOS/Linux: `ELECTRON_MIRROR=https://npmmirror.com/mirrors/electron/ pnpm install electron@31.0.2 -D`
* macOS/Linux: `ELECTRON_MIRROR=https://npmmirror.com/mirrors/electron/ pnpm install electron@31.1.0 -D`
* Windows:
* `SET ELECTRON_MIRROR=https://npmmirror.com/mirrors/electron/`
* `pnpm install electron@31.0.2 -D`
* `pnpm install electron@31.1.0 -D`

NPM mirror:

Expand All @@ -28,7 +28,7 @@ NPM mirror:

On the desktop, go to the app folder to run:

* `pnpm install electron@31.0.2 -D`
* `pnpm install electron@31.1.0 -D`
* `pnpm run dev`
* `pnpm run start`

Expand Down
6 changes: 3 additions & 3 deletions .github/CONTRIBUTING_zh_CN.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,11 @@

* macOS/Linux:
```
ELECTRON_MIRROR=https://npmmirror.com/mirrors/electron/ pnpm install electron@31.0.2 -D
ELECTRON_MIRROR=https://npmmirror.com/mirrors/electron/ pnpm install electron@31.1.0 -D
```
* Windows:
* `SET ELECTRON_MIRROR=https://npmmirror.com/mirrors/electron/`
* `pnpm install electron@31.0.2 -D`
* `pnpm install electron@31.1.0 -D`

NPM 镜像：

Expand All @@ -30,7 +30,7 @@ NPM 镜像：

桌面端进入 app 文件夹运行：

* `pnpm install electron@31.0.2 -D`
* `pnpm install electron@31.1.0 -D`
* `pnpm run dev`
* `pnpm run start`

Expand Down
2 changes: 1 addition & 1 deletion .vscode/extensions/Sillot/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"name": "sillot",
"displayName": "汐洛 Sillot",
"description": "汐洛彖夲肜矩阵（Sillot T☳Converbenk Matrix）为智慧新彖务服务。此插件为汐洛官方插件，提供多功能一体化集成。",
"version": "0.35.24062712",
"version": "0.35.24062722",
"preview": true,
"repository": "https://github.com/Hi-Windom/Sillot",
"publisher": "Hi-Windom",
Expand Down
12 changes: 5 additions & 7 deletions app/.babelrc
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
{
"presets": ["@babel/preset-env", ["@babel/preset-react", {"runtime": "automatic"}]],
"plugins": [
"@babel/plugin-proposal-nullish-coalescing-operator",
"@babel/plugin-proposal-optional-chaining"
]
}
{
"presets": ["@babel/preset-env", ["@babel/preset-react", {"runtime": "automatic"}]],
"plugins": [
]
}
4 changes: 2 additions & 2 deletions app/appearance/langs/en_US.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1535,8 +1535,8 @@
"241": "Drag to its subheading is not supported",
"242": "TODO",
"243": "Only list the first [%d] tags (including subtags), if you need to adjust, please modify [Settings - Doc Tree - Maximum number to list]",
"244": "It did not exit normally after the last use. It is recommended to execute [Doc Tree - Rebuild Index]. In the future, please exit the program completely before shutting down the computer",
"245": "It did not exit normally after the last use. It is recommended to execute [Doc Tree - Rebuild Index]. In the future, please use [Exit Application] in the right panel to exit normally",
"244": "Data indexing was not completed after the last use. Please execute [Doc Tree - Rebuild Index]. Please exit the program completely before shutting down the computer",
"245": "Data indexing was not completed after the last use. Please execute [Doc Tree - Rebuild Index]. Please use [Exit Application] in the right column panel to exit normally",
"246": "The document title cannot contain / and has been replaced with _",
"247": "File [%s] is larger than the maximum limit [%s], and has been ignored for uploading to the cloud",
"248": "The target heading is located in the container block and cannot be used as a drop point"
Expand Down
4 changes: 2 additions & 2 deletions app/appearance/langs/es_ES.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1533,8 +1533,8 @@
"241": "No se admite arrastrar a su subtítulo",
"242": "TODO",
"243": "Enumere solo las primeras [%d] etiquetas (incluidas las subetiquetas), modifique [Configuración - Árbol de documentos - Número máximo a listar]",
"244": "No salió normalmente después del último uso. Se recomienda ejecutar [Árbol de documentos - Reconstruir índice]. En el futuro, salga del programa por completo antes de apagar la computadora",
"245": "No salió normalmente después del último uso. Se recomienda ejecutar [Árbol de documentos - Reconstruir índice]. En el futuro, utilice [Salir de la aplicación] en el panel derecho para salir normalmente",
"244": "La indexación de datos no se ha completado desde el último uso. Ejecute [Árbol de documentos - Reconstruir índice] una vez. En el futuro, salga completamente del programa antes de apagar la computadora.",
"245": "La indexación de datos no se ha completado desde el último uso. Ejecute [Árbol de documentos - Reconstruir índice] una vez. Utilice [Salir de la aplicación] en el panel de la columna derecha para salir normalmente",
"246": "El título del documento no puede contener / y ha sido reemplazado por _",
"247": "El archivo [%s] es más grande que el límite máximo [%s] y se ha ignorado para cargarlo en la nube",
"248": "El rumbo de destino está ubicado en el bloque contenedor y no puede usarse como punto de entrega"
Expand Down
4 changes: 2 additions & 2 deletions app/appearance/langs/fr_FR.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1533,8 +1533,8 @@
"241": "Le glisser vers son sous-titre n'est pas pris en charge",
"242": "TODO",
"243": "Répertorier uniquement les [%d] premières balises (y compris les sous-balises). veuillez modifier [Paramètres - Arbre des documents - Nombre maximum de documents à lister].",
"244": "Il ne s'est pas terminé normalement après la dernière utilisation. Il est recommandé d'exécuter [Doc Tree - Reconstruire l'index]. À l'avenir, veuillez quitter complètement le programme avant d'éteindre l'ordinateur",
"245": "Il ne s'est pas terminé normalement après la dernière utilisation. Il est recommandé d'exécuter [Doc Tree - Reconstruire l'index]. À l'avenir, veuillez utiliser [Quitter l'application] dans le panneau de droite pour quitter normalement",
"244": "L'indexation des données n'a pas été terminée depuis la dernière utilisation. Veuillez exécuter [Arborescence des documents - Reconstruire l'index] une fois. À l'avenir, veuillez quitter complètement le programme avant d'éteindre l'ordinateur.",
"245": "L'indexation des données n'a pas été terminée depuis la dernière utilisation. Veuillez exécuter [Arborescence des documents - Reconstruire l'index] une fois. Veuillez utiliser [Quitter l'application] dans le panneau de la colonne de droite pour quitter normalement",
"246": "Le titre du document ne peut pas contenir / et a été remplacé par _",
"247": "Le fichier [%s] est plus grand que la limite maximale [%s] et a été ignoré pour le téléchargement vers le cloud",
"248": "Le cap cible est situé dans le bloc conteneur et ne peut pas être utilisé comme point de dépôt"
Expand Down
4 changes: 2 additions & 2 deletions app/appearance/langs/ja_JP.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1531,8 +1531,8 @@
"241": "小見出しへのドラッグはサポートされていません",
"242": "TODO",
"243": "最初の [%d] 個のタグ (サブタグを含む) のみを表示します。調整が必要な場合は [設定] - [ドキュメントツリー] - [リストする最大数] を変更してください",
"244": "前回の使用後に正常に終了しませんでした。[ドキュメントツリー] - [インデックスの再構築] を実行することをお勧めします。今後はコンピュータをシャットダウンする前にプログラムを完全に終了してください",
"245": "前回の使用後に正常に終了しませんでした。[ドキュメントツリー] - [インデックスの再構築] を実行することをお勧めします。今後は右パネルの [アプリケーションの終了] を使用して終了してください",
"244": "前回の使用以降、データのインデックス作成が完了していません。[ドキュメント ツリー - インデックスの再構築]を一度実行してください。今後は、コンピューターをシャットダウンする前にプログラムを完全に終了してください。",
"245": "前回の使用以降、データのインデックス作成が完了していません。[ドキュメント ツリー - インデックスの再構築]を一度実行してください。正常に終了するには、右列パネルの[アプリケーションの終了]を使用してください。",
"246": "ドキュメントのタイトルに / を含めることはできません。_ に置き換えられました",
"247": "ファイル [%s] は制限サイズ [%s] を超えているためアップロードされませんでした",
"248": "目標の見出しがコンテナブロック内にあるためドロップできません"
Expand Down
4 changes: 2 additions & 2 deletions app/appearance/langs/zh_CHT.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1533,8 +1533,8 @@
"241": "不支持拖曳為自己的子標題",
"242": "TODO",
"243": "僅列出前 [%d] 個標籤（含子標籤），如需調整請修改 [設置 - 文檔樹 - 最大列出數量]",
"244": "上次使用後未正常退出，建議執行一次 [文檔樹 - 重建索引]。以後請完整退出程式後再關閉電腦",
"245": "上次使用後未正常退出，建議執行一次 [文檔樹 - 重建索引]。以後請使用右側欄面板中的 [退出應用] 進行正常退出",
"244": "上次使用後未完成資料索引，請執行一次 [文檔樹 - 重建索引]。以後請完整退出程式後再關閉電腦",
"245": "上次使用後未完成資料索引，請執行一次 [文檔樹 - 重建索引]。以後請使用右側欄面板中的 [退出應用] 進行正常退出",
"246": "文件標題不能包含 /，已經使用 _ 替換",
"247": "檔案 [%s] 大於最大限制 [%s]，已忽略上傳至社群圖床",
"248": "目標標題位於容器區塊中，無法作為放置點"
Expand Down
4 changes: 2 additions & 2 deletions app/appearance/langs/zh_CN.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1536,8 +1536,8 @@
"241": "不支持拖拽为自己的子标题",
"242": "TODO",
"243": "仅列出前 [%d] 个标签（含子标签），如需调整请修改 [设置 - 文档树 - 最大列出数量]",
"244": "上次使用后未正常退出，建议执行一次 [文档树 - 重建索引]。以后请完整退出程序后再关闭电脑",
"245": "上次使用后未正常退出，建议执行一次 [文档树 - 重建索引]。以后请使用右侧栏面板中的 [退出应用] 进行正常退出",
"244": "上次使用后未完成数据索引，请执行一次 [文档树 - 重建索引]。以后请完整退出程序后再关闭电脑",
"245": "上次使用后未完成数据索引，请执行一次 [文档树 - 重建索引]。以后请使用右侧栏面板中的 [退出应用] 进行正常退出",
"246": "文档标题不能包含 /，已经使用 _ 替换",
"247": "文件 [%s] 大于最大限制 [%s]，已忽略上传到社区图床",
"248": "目标标题位于容器块中，无法作为放置点"
Expand Down
6 changes: 2 additions & 4 deletions app/package.json
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "sillot",
"version": "0.35.24062712",
"version": "0.35.24062722",
"syv": "3.1.0",
"sypv": "[3.0.16, 3.0.17]",
"description": "Build Your Eternal Digital Garden",
Expand Down Expand Up @@ -79,8 +79,6 @@
],
"devDependencies": {
"@babel/core": "^7.24.7",
"@babel/plugin-proposal-nullish-coalescing-operator": "^7.18.6",
"@babel/plugin-proposal-optional-chaining": "^7.21.0",
"@babel/plugin-transform-runtime": "^7.24.7",
"@babel/preset-env": "^7.24.7",
"@babel/preset-react": "^7.24.7",
Expand Down Expand Up @@ -113,7 +111,7 @@
"csstype": "^3.1.3",
"date-fns": "^3.6.0",
"ejs": "^3.1.10",
"electron": "32.0.0-alpha.3",
"electron": "31.1.0",
"electron-builder": "24.9.1",
"electron-reloader": "^1.2.3",
"encoding": "^0.1.13",
Expand Down
2 changes: 1 addition & 1 deletion docs/starlight/package.json
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "starlight",
"type": "module",
"version": "0.35.24062712",
"version": "0.35.24062722",
"scripts": {
"test": "echo 'Test your sister day by day'",
"dev": "astro dev",
Expand Down
32 changes: 16 additions & 16 deletions kernel/go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ require (
github.com/88250/pdfcpu v0.3.14-0.20230401044135-c7369a99720c
github.com/88250/vitess-sqlparser v0.0.0-20210205111146-56a2ded2aba1
github.com/ClarkThan/ahocorasick v0.0.0-20231011042242-30d1ef1347f4
github.com/ConradIrwin/font v0.0.0-20210318200717-ce8d41cc0732
github.com/ConradIrwin/font v0.0.0-20240627033111-8567075b2bfe
github.com/Masterminds/sprig/v3 v3.2.3
github.com/PuerkitoBio/goquery v1.9.2
github.com/Xuanwo/go-locale v1.1.0
Expand All @@ -37,28 +37,28 @@ require (
github.com/gin-gonic/gin v1.10.0
github.com/go-ole/go-ole v1.3.0
github.com/goccy/go-json v0.10.3
github.com/gofrs/flock v0.8.1
github.com/gofrs/flock v0.9.0
github.com/golang-jwt/jwt/v5 v5.2.1
github.com/gorilla/css v1.0.1
github.com/gorilla/websocket v1.5.1
github.com/gorilla/websocket v1.5.3
github.com/imroc/req/v3 v3.43.7
github.com/jinzhu/copier v0.4.0
github.com/json-iterator/go v1.1.12
github.com/klippa-app/go-pdfium v1.12.1
github.com/klippa-app/go-pdfium v1.12.2
github.com/mattn/go-sqlite3 v2.0.3+incompatible
github.com/mitchellh/go-ps v1.0.0
github.com/mssola/useragent v1.0.0
github.com/olahol/melody v1.2.1
github.com/open-spaced-repetition/go-fsrs v1.2.1
github.com/panjf2000/ants/v2 v2.9.1
github.com/panjf2000/ants/v2 v2.10.0
github.com/patrickmn/go-cache v2.1.0+incompatible
github.com/radovskyb/watcher v1.0.7
github.com/rqlite/sql v0.0.0-20240312185922-ffac88a740bd
github.com/sabhiram/go-gitignore v0.0.0-20210923224102-525f6e181f06
github.com/sashabaranov/go-openai v1.24.1
github.com/sashabaranov/go-openai v1.26.1
github.com/shirou/gopsutil/v3 v3.24.5
github.com/siyuan-note/dejavu v0.0.0-20240626145351-e4f9b0821aaf
github.com/siyuan-note/eventbus v0.0.0-20240318125243-801c98e8f025
github.com/siyuan-note/eventbus v0.0.0-20240627125516-396fdb0f0f97
github.com/siyuan-note/filelock v0.0.0-20240505150405-3de3a406d257
github.com/siyuan-note/httpclient v0.0.0-20240626145026-29585d45a51c
github.com/siyuan-note/logging v0.0.0-20240505035402-6430d57006a2
Expand All @@ -70,7 +70,7 @@ require (
github.com/vmihailenco/msgpack/v5 v5.4.1
github.com/xrash/smetrics v0.0.0-20240521201337-686a1a2994c1
github.com/xuri/excelize/v2 v2.8.1
golang.org/x/image v0.17.0
golang.org/x/image v0.18.0
golang.org/x/mobile v0.0.0-20240520174638-fa72addaaa1b
golang.org/x/mod v0.18.0
golang.org/x/text v0.16.0
Expand All @@ -89,8 +89,8 @@ require (
github.com/andybalholm/brotli v1.1.0 // indirect
github.com/andybalholm/cascadia v1.3.2 // indirect
github.com/asaskevich/EventBus v0.0.0-20200907212545-49d423059eef // indirect
github.com/aws/aws-sdk-go v1.54.2 // indirect
github.com/bytedance/sonic v1.11.8 // indirect
github.com/aws/aws-sdk-go v1.54.9 // indirect
github.com/bytedance/sonic v1.11.9 // indirect
github.com/bytedance/sonic/loader v0.1.1 // indirect
github.com/cespare/xxhash/v2 v2.3.0 // indirect
github.com/cloudflare/circl v1.3.9 // indirect
Expand All @@ -104,7 +104,7 @@ require (
github.com/gin-contrib/sse v0.1.0 // indirect
github.com/go-playground/locales v0.14.1 // indirect
github.com/go-playground/universal-translator v0.18.1 // indirect
github.com/go-playground/validator/v10 v10.21.0 // indirect
github.com/go-playground/validator/v10 v10.22.0 // indirect
github.com/go-resty/resty/v2 v2.13.1 // indirect
github.com/go-task/slim-sprig/v3 v3.0.0 // indirect
github.com/golang/freetype v0.0.0-20170609003504-e2365dfdc4a0 // indirect
Expand All @@ -114,19 +114,19 @@ require (
github.com/gopherjs/gopherjs v1.17.2 // indirect
github.com/gorilla/context v1.1.2 // indirect
github.com/gorilla/securecookie v1.1.2 // indirect
github.com/gorilla/sessions v1.2.2 // indirect
github.com/gorilla/sessions v1.3.0 // indirect
github.com/hashicorp/errwrap v1.1.0 // indirect
github.com/hashicorp/go-multierror v1.1.1 // indirect
github.com/hhrutter/lzw v1.0.0 // indirect
github.com/hhrutter/tiff v1.0.1 // indirect
github.com/huandu/xstrings v1.4.0 // indirect
github.com/huandu/xstrings v1.5.0 // indirect
github.com/imdario/mergo v0.3.16 // indirect
github.com/jaytaylor/html2text v0.0.0-20230321000545-74c2419ad056 // indirect
github.com/jmespath/go-jmespath v0.4.0 // indirect
github.com/jolestar/go-commons-pool/v2 v2.1.2 // indirect
github.com/juju/errors v1.0.0 // indirect
github.com/klauspost/compress v1.17.9 // indirect
github.com/klauspost/cpuid/v2 v2.2.7 // indirect
github.com/klauspost/cpuid/v2 v2.2.8 // indirect
github.com/leodido/go-urn v1.4.0 // indirect
github.com/levigross/exp-html v0.0.0-20120902181939-8df60c69a8f5 // indirect
github.com/lufia/plan9stats v0.0.0-20240513124658-fba389f38bae // indirect
Expand Down Expand Up @@ -155,7 +155,7 @@ require (
github.com/shoenig/go-m1cpu v0.1.6 // indirect
github.com/shopspring/decimal v1.4.0 // indirect
github.com/ssor/bom v0.0.0-20170718123548-6386211fdfcf // indirect
github.com/tetratelabs/wazero v1.7.2 // indirect
github.com/tetratelabs/wazero v1.7.3 // indirect
github.com/tklauser/go-sysconf v0.3.14 // indirect
github.com/tklauser/numcpus v0.8.0 // indirect
github.com/twitchyliquid64/golang-asm v0.15.1 // indirect
Expand All @@ -173,7 +173,7 @@ require (
golang.org/x/sync v0.7.0 // indirect
golang.org/x/sys v0.21.0 // indirect
golang.org/x/tools v0.22.0 // indirect
google.golang.org/protobuf v1.34.1 // indirect
google.golang.org/protobuf v1.34.2 // indirect
gopkg.in/yaml.v2 v2.4.0 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
)
Expand Down
Loading

0 comments on commit efbac9f

Please sign in to comment.