From 060eb0fd610d74de0687c3e7ff0ebef886560203 Mon Sep 17 00:00:00 2001 From: Daniel <845765@qq.com> Date: Sun, 23 Feb 2025 16:44:03 +0800 Subject: [PATCH 1/4] :bug: Fix wrong process name https://github.com/siyuan-note/siyuan/issues/13903 --- app/package.json | 2 +- app/pnpm-lock.yaml | 55 ++++++++++++++++++++-------------------------- 2 files changed, 25 insertions(+), 32 deletions(-) diff --git a/app/package.json b/app/package.json index c5603cb74..6eec2b856 100644 --- a/app/package.json +++ b/app/package.json @@ -57,7 +57,7 @@ "css-loader": "^6.7.1", "dayjs": "^1.11.5", "electron": "33.4.1", - "electron-builder": "26.0.7", + "electron-builder": "26.0.8", "encoding": "^0.1.13", "esbuild-loader": "^3.0.1", "eslint": "^9.15.0", diff --git a/app/pnpm-lock.yaml b/app/pnpm-lock.yaml index 08fd1cc3d..c4ce1d5b7 100644 --- a/app/pnpm-lock.yaml +++ b/app/pnpm-lock.yaml @@ -37,8 +37,8 @@ importers: specifier: 33.4.1 version: 33.4.1 electron-builder: - specifier: 26.0.7 - version: 26.0.7(electron-builder-squirrel-windows@25.0.5) + specifier: 26.0.8 + version: 26.0.8(electron-builder-squirrel-windows@25.0.5) encoding: specifier: ^0.1.13 version: 0.1.13 @@ -730,12 +730,12 @@ packages: dmg-builder: 25.0.5 electron-builder-squirrel-windows: 25.0.5 - app-builder-lib@26.0.7: - resolution: {integrity: sha512-Sa6qGtt2l9of+KEA2fxdRBNLcWld74xgaP+U3Zr3A0R529Z2jPfUTmLi0dDY3jwRF6uOrsQAEkN+JWWvw5WpPw==} + app-builder-lib@26.0.8: + resolution: {integrity: sha512-inISmbUzsWJcKUHEzANHvh4Z3Tqld3lcGa6TfDzEBzhAcku2JhOX4GXz7w/Yb+mjQIFcfUGD8NDAfu/hjv3AiA==} engines: {node: '>=14.0.0'} peerDependencies: - dmg-builder: 26.0.7 - electron-builder-squirrel-windows: 26.0.7 + dmg-builder: 26.0.8 + electron-builder-squirrel-windows: 26.0.8 aproba@2.0.0: resolution: {integrity: sha512-lYe4Gx7QT+MKGbDsA+Z+he/Wtef0BiwDOlK/XkBrdfsh9J/jPPXbX0tE9x9cl27Tmu5gg3QUbUrQYa/y+KOHPQ==} @@ -1091,8 +1091,8 @@ packages: dir-compare@4.2.0: resolution: {integrity: sha512-2xMCmOoMrdQIPHdsTawECdNPwlVFB9zGcz3kuhmBO6U3oU+UQjsue0i8ayLKpgBcm+hcXPMVSGUN9d+pvJ6+VQ==} - dmg-builder@26.0.7: - resolution: {integrity: sha512-fsMjG/TmwcC7HzjSNi+3mlEUgo0RrWwq44VB9XKcGtTPPfqfSi3JvhWCCsAWzElZ0OtSO/DnK/TNgSqyaG/Ajw==} + dmg-builder@26.0.8: + resolution: {integrity: sha512-m2exxy1w/I5XuJ3+AKsInW+odHhXMuyPVFQ4feUnBX/dsyfKcA8f5TesmSWPD4+SoyB3Hgefz9FGLn7CI3+/NQ==} dmg-license@1.0.11: resolution: {integrity: sha512-ZdzmqwKmECOWJpqefloC5OJy1+WZBBse5+MR88z9g9Zn4VY+WYUkAyojmhzJckH5YbbZGcYIuGAkY5/Ys5OM2Q==} @@ -1141,8 +1141,8 @@ packages: electron-builder-squirrel-windows@25.0.5: resolution: {integrity: sha512-N2U7LGSdt4hmEhjEeIV2XJbjj2YIrTL6enfsGKfOhGTpL6GEejUmT3gjdKUqKBS5+NBx0GWhnEwD3MpO2P6Nfg==} - electron-builder@26.0.7: - resolution: {integrity: sha512-nVSaWw3dMLGGLrI/7WSifYzNGNseIpvmFwBRwi2E8tOUkcqN+em+3qYeRq8k/AYHRDcrmj6UCJJT6rBo+bikfw==} + electron-builder@26.0.8: + resolution: {integrity: sha512-7Heomwy2C9OUJQOYN+zdPSVhIEmaw59v6cPYZWx/FvGX4UbcH5HT2AdjxAzLkcMTAbwVwt1TqmJr9LPs6SYvEA==} engines: {node: '>=14.0.0'} hasBin: true @@ -1715,11 +1715,6 @@ packages: resolution: {integrity: sha512-g1MWMLBiz8FKi1e4w0UyVL3w+iJceWAFBAaBnnGKOpNa5f8TLktkbre1+s6oICydWAm+HRUGTmI+//xv2hvXYA==} hasBin: true - json5@2.2.1: - resolution: {integrity: sha512-1hqLFMSrGHRHxav9q9gNjJ5EXznIxGVO09xQRrwplcS8qs28pZ8s8hupZAmqDwZUmVZ2Qb2jnyPOWcDH8m8dlA==} - engines: {node: '>=6'} - hasBin: true - json5@2.2.3: resolution: {integrity: sha512-XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg==} engines: {node: '>=6'} @@ -3430,7 +3425,7 @@ snapshots: app-builder-bin@5.0.0-alpha.7: {} - app-builder-lib@25.0.5(dmg-builder@26.0.7)(electron-builder-squirrel-windows@25.0.5): + app-builder-lib@25.0.5(dmg-builder@26.0.8)(electron-builder-squirrel-windows@25.0.5): dependencies: '@develar/schema-utils': 2.6.5 '@electron/notarize': 2.3.2 @@ -3445,9 +3440,9 @@ snapshots: builder-util-runtime: 9.2.5 chromium-pickle-js: 0.2.0 debug: 4.3.4 - dmg-builder: 26.0.7(electron-builder-squirrel-windows@25.0.5) + dmg-builder: 26.0.8(electron-builder-squirrel-windows@25.0.5) ejs: 3.1.10 - electron-builder-squirrel-windows: 25.0.5(dmg-builder@26.0.7) + electron-builder-squirrel-windows: 25.0.5(dmg-builder@26.0.8) electron-publish: 25.0.3 form-data: 4.0.0 fs-extra: 10.1.0 @@ -3467,7 +3462,7 @@ snapshots: - bluebird - supports-color - app-builder-lib@26.0.7(dmg-builder@26.0.7)(electron-builder-squirrel-windows@25.0.5): + app-builder-lib@26.0.8(dmg-builder@26.0.8)(electron-builder-squirrel-windows@25.0.5): dependencies: '@develar/schema-utils': 2.6.5 '@electron/asar': 3.2.18 @@ -3484,11 +3479,11 @@ snapshots: chromium-pickle-js: 0.2.0 config-file-ts: 0.2.8-rc1 debug: 4.3.4 - dmg-builder: 26.0.7(electron-builder-squirrel-windows@25.0.5) + dmg-builder: 26.0.8(electron-builder-squirrel-windows@25.0.5) dotenv: 16.4.5 dotenv-expand: 11.0.6 ejs: 3.1.10 - electron-builder-squirrel-windows: 25.0.5(dmg-builder@26.0.7) + electron-builder-squirrel-windows: 25.0.5(dmg-builder@26.0.8) electron-publish: 26.0.7 fs-extra: 10.1.0 hosted-git-info: 4.1.0 @@ -3933,9 +3928,9 @@ snapshots: minimatch: 3.1.2 p-limit: 3.1.0 - dmg-builder@26.0.7(electron-builder-squirrel-windows@25.0.5): + dmg-builder@26.0.8(electron-builder-squirrel-windows@25.0.5): dependencies: - app-builder-lib: 26.0.7(dmg-builder@26.0.7)(electron-builder-squirrel-windows@25.0.5) + app-builder-lib: 26.0.8(dmg-builder@26.0.8)(electron-builder-squirrel-windows@25.0.5) builder-util: 26.0.7 builder-util-runtime: 9.3.1 fs-extra: 10.1.0 @@ -4001,9 +3996,9 @@ snapshots: dependencies: jake: 10.8.5 - electron-builder-squirrel-windows@25.0.5(dmg-builder@26.0.7): + electron-builder-squirrel-windows@25.0.5(dmg-builder@26.0.8): dependencies: - app-builder-lib: 25.0.5(dmg-builder@26.0.7)(electron-builder-squirrel-windows@25.0.5) + app-builder-lib: 25.0.5(dmg-builder@26.0.8)(electron-builder-squirrel-windows@25.0.5) archiver: 5.3.2 builder-util: 25.0.3 fs-extra: 10.1.0 @@ -4012,13 +4007,13 @@ snapshots: - dmg-builder - supports-color - electron-builder@26.0.7(electron-builder-squirrel-windows@25.0.5): + electron-builder@26.0.8(electron-builder-squirrel-windows@25.0.5): dependencies: - app-builder-lib: 26.0.7(dmg-builder@26.0.7)(electron-builder-squirrel-windows@25.0.5) + app-builder-lib: 26.0.8(dmg-builder@26.0.8)(electron-builder-squirrel-windows@25.0.5) builder-util: 26.0.7 builder-util-runtime: 9.3.1 chalk: 4.1.2 - dmg-builder: 26.0.7(electron-builder-squirrel-windows@25.0.5) + dmg-builder: 26.0.8(electron-builder-squirrel-windows@25.0.5) fs-extra: 10.1.0 is-ci: 3.0.1 lazy-val: 1.0.5 @@ -4696,8 +4691,6 @@ snapshots: dependencies: minimist: 1.2.8 - json5@2.2.1: {} - json5@2.2.3: {} jsonfile@4.0.0: @@ -4741,7 +4734,7 @@ snapshots: dependencies: big.js: 5.2.2 emojis-list: 3.0.0 - json5: 2.2.1 + json5: 2.2.3 locate-path@5.0.0: dependencies: From f99025d468d2fda8acd5d3ffa2115a9a585d86bb Mon Sep 17 00:00:00 2001 From: Daniel <845765@qq.com> Date: Sun, 23 Feb 2025 17:11:05 +0800 Subject: [PATCH 2/4] :art: Improve find-replace of text containing escape characters https://github.com/siyuan-note/siyuan/issues/14173 --- kernel/model/search.go | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/kernel/model/search.go b/kernel/model/search.go index eb261fd08..5afe09fcf 100644 --- a/kernel/model/search.go +++ b/kernel/model/search.go @@ -588,7 +588,11 @@ func FindReplace(keyword, replacement string, replaceTypes map[string]bool, ids } if replaceTextNode(n, method, keyword, replacement, r, luteEngine) { - unlinks = append(unlinks, n) + if nil != n.Parent && ast.NodeBackslash == n.Parent.Type { + unlinks = append(unlinks, n.Parent) + } else { + unlinks = append(unlinks, n) + } } case ast.NodeLinkDest: if !replaceTypes["imgSrc"] { From 5bd825ce542d357e6d78420c624fcd91bb3e9447 Mon Sep 17 00:00:00 2001 From: Daniel <845765@qq.com> Date: Sun, 23 Feb 2025 17:11:18 +0800 Subject: [PATCH 3/4] :memo: Update changelogs --- app/changelogs/v3.1.23/v3.1.23.md | 1 + app/changelogs/v3.1.23/v3.1.23_zh_CHT.md | 1 + app/changelogs/v3.1.23/v3.1.23_zh_CN.md | 1 + 3 files changed, 3 insertions(+) diff --git a/app/changelogs/v3.1.23/v3.1.23.md b/app/changelogs/v3.1.23/v3.1.23.md index 76b4ef3b1..7d1d99526 100644 --- a/app/changelogs/v3.1.23/v3.1.23.md +++ b/app/changelogs/v3.1.23/v3.1.23.md @@ -46,6 +46,7 @@ Below are the detailed changes in this version. * [Improve appearance mode switch](https://github.com/siyuan-note/siyuan/issues/14157) * [Pasting text with a `>` in the middle no longer creates a blockquote block](https://github.com/siyuan-note/siyuan/issues/14162) * [Display reference counts after unfolding headings](https://github.com/siyuan-note/siyuan/issues/14169) +* [Improve find-replace of text containing escape characters](https://github.com/siyuan-note/siyuan/issues/14173) ### Bugfix diff --git a/app/changelogs/v3.1.23/v3.1.23_zh_CHT.md b/app/changelogs/v3.1.23/v3.1.23_zh_CHT.md index 5af84be4c..3701c2b5a 100644 --- a/app/changelogs/v3.1.23/v3.1.23_zh_CHT.md +++ b/app/changelogs/v3.1.23/v3.1.23_zh_CHT.md @@ -46,6 +46,7 @@ * [改良外觀模式切換](https://github.com/siyuan-note/siyuan/issues/14157) * [貼上中間包含 `>` 的文字時不再建立引述區塊](https://github.com/siyuan-note/siyuan/issues/14162) * [展開折疊的標題後顯示區塊引用計數](https://github.com/siyuan-note/siyuan/issues/14169) +* [改進包含轉義符的文字搜尋替換](https://github.com/siyuan-note/siyuan/issues/14173) ### 修復缺陷 diff --git a/app/changelogs/v3.1.23/v3.1.23_zh_CN.md b/app/changelogs/v3.1.23/v3.1.23_zh_CN.md index 7f67b5669..97a53003d 100644 --- a/app/changelogs/v3.1.23/v3.1.23_zh_CN.md +++ b/app/changelogs/v3.1.23/v3.1.23_zh_CN.md @@ -46,6 +46,7 @@ * [改进外观模式切换](https://github.com/siyuan-note/siyuan/issues/14157) * [粘贴中间包含 `>` 的文本时不再创建引述块](https://github.com/siyuan-note/siyuan/issues/14162) * [展开折叠的标题后显示块引用计数](https://github.com/siyuan-note/siyuan/issues/14169) +* [改进包含转义符的文本搜索替换](https://github.com/siyuan-note/siyuan/issues/14173) ### 修复缺陷 From a0ad640114104b2781e0cd77540cca2c338793d3 Mon Sep 17 00:00:00 2001 From: Daniel <845765@qq.com> Date: Sun, 23 Feb 2025 17:12:05 +0800 Subject: [PATCH 4/4] :art: Improve linux target build --- app/electron-builder-linux-arm64.yml | 10 ++++++---- app/electron-builder-linux.yml | 10 ++++++---- 2 files changed, 12 insertions(+), 8 deletions(-) diff --git a/app/electron-builder-linux-arm64.yml b/app/electron-builder-linux-arm64.yml index e84fc3c81..5546ea0ca 100644 --- a/app/electron-builder-linux-arm64.yml +++ b/app/electron-builder-linux-arm64.yml @@ -19,10 +19,12 @@ linux: category: "Utility" executableName: "siyuan" desktop: { - "Name": "SiYuan", - "Comment": "Refactor your thinking", - "Type": "Application", - "Categories": "Utility;" + entry: { + Name: "SiYuan", + Comment: "Refactor your thinking", + Type: "Application", + Categories: "Utility;" + } } extraResources: - from: "kernel-linux-arm64" diff --git a/app/electron-builder-linux.yml b/app/electron-builder-linux.yml index 29de06f4f..e73ba354b 100644 --- a/app/electron-builder-linux.yml +++ b/app/electron-builder-linux.yml @@ -19,10 +19,12 @@ linux: category: "Utility" executableName: "siyuan" desktop: { - "Name": "SiYuan", - "Comment": "Refactor your thinking", - "Type": "Application", - "Categories": "Utility;" + entry: { + Name: "SiYuan", + Comment: "Refactor your thinking", + Type: "Application", + Categories: "Utility;" + } } extraResources: - from: "kernel-linux"