From b419ff0dc4ef29e7dd0b0b74f4162f2839dd1651 Mon Sep 17 00:00:00 2001 From: Tienson Qin Date: Fri, 23 May 2025 18:27:26 +0800 Subject: [PATCH 1/5] test: downgrade electron and better-sqlite3 --- package.json | 2 +- resources/package.json | 8 ++++---- static/yarn.lock | 16 ++++++++-------- yarn.lock | 8 ++++---- 4 files changed, 17 insertions(+), 17 deletions(-) diff --git a/package.json b/package.json index 84e49174d1..b809cec993 100644 --- a/package.json +++ b/package.json @@ -113,7 +113,7 @@ "d3-force": "3.0.0", "diff": "5.0.0", "dompurify": "2.4.0", - "electron": "36.2.0", + "electron": "35.2.2", "electron-dl": "^4.0.0", "fs": "0.0.1-security", "fs-extra": "9.1.0", diff --git a/resources/package.json b/resources/package.json index d19fd3788c..81137fe2a1 100644 --- a/resources/package.json +++ b/resources/package.json @@ -14,7 +14,7 @@ "electron:make-linux-arm64": "electron-forge make --platform=linux --arch=arm64", "electron:make-macos-arm64": "electron-forge make --platform=darwin --arch=arm64", "electron:publish:github": "electron-forge publish", - "rebuild:all": "electron-rebuild -v 36.2.0 -f", + "rebuild:all": "electron-rebuild -v 35.2.2 -f", "postinstall": "install-app-deps" }, "config": { @@ -25,7 +25,7 @@ "@logseq/rsapi": "0.0.91", "@sentry/electron": "2.5.1", "abort-controller": "3.0.0", - "better-sqlite3": "^11.10.0", + "better-sqlite3": "11.9.1", "chokidar": "^3.5.1", "command-exists": "1.2.9", "diff-match-patch": "1.0.5", @@ -55,12 +55,12 @@ "@electron-forge/maker-squirrel": "^7.8.0", "@electron-forge/maker-zip": "^7.8.0", "@electron/rebuild": "4.0.1", - "electron": "36.2.0", + "electron": "35.2.2", "electron-builder": "26.0.12", "electron-forge-maker-appimage": "https://github.com/logseq/electron-forge-maker-appimage.git" }, "resolutions": { - "**/electron": "36.2.0", + "**/electron": "35.2.2", "**/node-abi": "3.75.0", "**/node-gyp": "11.1.0", "string-width": "4.2.0", diff --git a/static/yarn.lock b/static/yarn.lock index 03f17ebf13..ac7392e027 100644 --- a/static/yarn.lock +++ b/static/yarn.lock @@ -1194,10 +1194,10 @@ base64-js@^1.3.1, base64-js@^1.5.1: resolved "https://registry.yarnpkg.com/base64-js/-/base64-js-1.5.1.tgz#1b1b440160a5bf7ad40b650f095963481903930a" integrity sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA== -better-sqlite3@^11.10.0: - version "11.10.0" - resolved "https://registry.yarnpkg.com/better-sqlite3/-/better-sqlite3-11.10.0.tgz#2b1b14c5acd75a43fd84d12cc291ea98cef57d98" - integrity sha512-EwhOpyXiOEL/lKzHz9AW1msWFNzGc/z+LzeB3/jnFJpxu+th2yqvzsSWas1v9jgs9+xiXJcD5A8CJxAG2TaghQ== +better-sqlite3@11.9.1: + version "11.9.1" + resolved "https://registry.yarnpkg.com/better-sqlite3/-/better-sqlite3-11.9.1.tgz#0540da2f2ce24cbd766bb35db412f4be2c75b8bb" + integrity sha512-Ba0KR+Fzxh2jDRhdg6TSH0SJGzb8C0aBY4hR8w8madIdIzzC6Y1+kx5qR6eS1Z+Gy20h6ZU28aeyg0z1VIrShQ== dependencies: bindings "^1.5.0" prebuild-install "^7.1.1" @@ -2044,10 +2044,10 @@ electron-wix-msi@^5.1.3: optionalDependencies: "@bitdisaster/exe-icon-extractor" "^1.0.10" -electron@*, electron@36.2.0: - version "36.2.0" - resolved "https://registry.yarnpkg.com/electron/-/electron-36.2.0.tgz#05bb179eb4c5de0412fc6d49628abc949fd679c1" - integrity sha512-5yldoRjBKxPQfI0QMX+qq750o3Nl8N1SZnJqOPMq0gZ6rIJ+7y4ZLp808GrFwjfTm05TYgq3GSD8FGuKQZqwEw== +electron@*, electron@35.2.2: + version "35.2.2" + resolved "https://registry.yarnpkg.com/electron/-/electron-35.2.2.tgz#3eb16819eae70e492a9251cde4929687893e0c2e" + integrity sha512-jZnCOtIgrt28esWP5z/PKndj/vPQ/Zt+cvNRlb/qOGnK/AjW1mASwPMtQ099NlSodf69RR3JrhnZCYbTWeDR4g== dependencies: "@electron/get" "^2.0.0" "@types/node" "^22.7.7" diff --git a/yarn.lock b/yarn.lock index a867e9b49a..5c15ee7d8b 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2688,10 +2688,10 @@ electron-to-chromium@^1.5.149: resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.5.151.tgz#5edd6c17e1b2f14b4662c41b9379f96cc8c2bb7c" integrity sha512-Rl6uugut2l9sLojjS4H4SAr3A4IgACMLgpuEMPYCVcKydzfyPrn5absNRju38IhQOf/NwjJY8OGWjlteqYeBCA== -electron@36.2.0: - version "36.2.0" - resolved "https://registry.yarnpkg.com/electron/-/electron-36.2.0.tgz#05bb179eb4c5de0412fc6d49628abc949fd679c1" - integrity sha512-5yldoRjBKxPQfI0QMX+qq750o3Nl8N1SZnJqOPMq0gZ6rIJ+7y4ZLp808GrFwjfTm05TYgq3GSD8FGuKQZqwEw== +electron@35.2.2: + version "35.2.2" + resolved "https://registry.yarnpkg.com/electron/-/electron-35.2.2.tgz#3eb16819eae70e492a9251cde4929687893e0c2e" + integrity sha512-jZnCOtIgrt28esWP5z/PKndj/vPQ/Zt+cvNRlb/qOGnK/AjW1mASwPMtQ099NlSodf69RR3JrhnZCYbTWeDR4g== dependencies: "@electron/get" "^2.0.0" "@types/node" "^22.7.7" From 97669c46e2cae5ba59441e69e1c8272473006aff Mon Sep 17 00:00:00 2001 From: Tienson Qin Date: Sat, 24 May 2025 16:16:12 +0800 Subject: [PATCH 2/5] test: downgrade electron --- .github/workflows/build-android.yml | 2 +- .github/workflows/build-demo.yml | 2 +- .github/workflows/build-desktop-release.yml | 2 +- .github/workflows/build-ios-release.yml | 2 +- .github/workflows/build-ios.yml | 2 +- .github/workflows/build-stage.yml | 2 +- .github/workflows/build.yml | 2 +- .github/workflows/db.yml | 2 +- .github/workflows/e2e.yml | 2 +- .github/workflows/graph-parser.yml | 2 +- .github/workflows/logseq-common.yml | 2 +- .github/workflows/publishing.yml | 2 +- package.json | 2 +- resources/package.json | 6 +++--- static/yarn.lock | 24 +++++++++++++++------ yarn.lock | 24 +++++++++++++++------ 16 files changed, 52 insertions(+), 28 deletions(-) diff --git a/.github/workflows/build-android.yml b/.github/workflows/build-android.yml index d7f1220788..a99072e2e6 100644 --- a/.github/workflows/build-android.yml +++ b/.github/workflows/build-android.yml @@ -42,7 +42,7 @@ on: env: CLOJURE_VERSION: '1.11.1.1413' - NODE_VERSION: '22' + NODE_VERSION: '20' JAVA_VERSION: '17' jobs: diff --git a/.github/workflows/build-demo.yml b/.github/workflows/build-demo.yml index c47556b573..bb92b55827 100644 --- a/.github/workflows/build-demo.yml +++ b/.github/workflows/build-demo.yml @@ -19,7 +19,7 @@ on: env: CLOJURE_VERSION: '1.11.1.1413' - NODE_VERSION: '22' + NODE_VERSION: '20' JAVA_VERSION: '17' jobs: diff --git a/.github/workflows/build-desktop-release.yml b/.github/workflows/build-desktop-release.yml index 5505da9dfa..c2a5405e0b 100644 --- a/.github/workflows/build-desktop-release.yml +++ b/.github/workflows/build-desktop-release.yml @@ -48,7 +48,7 @@ on: env: CLOJURE_VERSION: '1.11.1.1413' - NODE_VERSION: '22' + NODE_VERSION: '20' JAVA_VERSION: '11' jobs: diff --git a/.github/workflows/build-ios-release.yml b/.github/workflows/build-ios-release.yml index ca90511592..14403bce67 100644 --- a/.github/workflows/build-ios-release.yml +++ b/.github/workflows/build-ios-release.yml @@ -12,7 +12,7 @@ on: env: CLOJURE_VERSION: '1.11.1.1413' - NODE_VERSION: '22' + NODE_VERSION: '20' JAVA_VERSION: '11' jobs: diff --git a/.github/workflows/build-ios.yml b/.github/workflows/build-ios.yml index 0b580b0c38..acb7b074dc 100644 --- a/.github/workflows/build-ios.yml +++ b/.github/workflows/build-ios.yml @@ -17,7 +17,7 @@ on: env: CLOJURE_VERSION: '1.11.1.1413' - NODE_VERSION: '22' + NODE_VERSION: '20' JAVA_VERSION: '11' jobs: diff --git a/.github/workflows/build-stage.yml b/.github/workflows/build-stage.yml index 7811fe4fc9..85b8027418 100644 --- a/.github/workflows/build-stage.yml +++ b/.github/workflows/build-stage.yml @@ -19,7 +19,7 @@ on: env: CLOJURE_VERSION: '1.11.1.1413' - NODE_VERSION: '22' + NODE_VERSION: '20' JAVA_VERSION: '17' jobs: diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 39d800d2ab..cfca0afd6c 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -14,7 +14,7 @@ env: CLOJURE_VERSION: '1.11.1.1413' JAVA_VERSION: '11' # This is the latest node version we can run. - NODE_VERSION: '22' + NODE_VERSION: '20' BABASHKA_VERSION: '1.0.168' jobs: diff --git a/.github/workflows/db.yml b/.github/workflows/db.yml index 086aaf30c5..a54451f544 100644 --- a/.github/workflows/db.yml +++ b/.github/workflows/db.yml @@ -23,7 +23,7 @@ env: CLOJURE_VERSION: '1.11.1.1413' JAVA_VERSION: '11' # This is the latest node version we can run. - NODE_VERSION: '22' + NODE_VERSION: '20' BABASHKA_VERSION: '1.0.168' jobs: diff --git a/.github/workflows/e2e.yml b/.github/workflows/e2e.yml index 950d4838dc..2f4127a91f 100644 --- a/.github/workflows/e2e.yml +++ b/.github/workflows/e2e.yml @@ -18,7 +18,7 @@ env: CLOJURE_VERSION: '1.11.1.1413' JAVA_VERSION: '11' # This is the latest node version we can run. - NODE_VERSION: '22' + NODE_VERSION: '20' BABASHKA_VERSION: '1.0.168' jobs: diff --git a/.github/workflows/graph-parser.yml b/.github/workflows/graph-parser.yml index c4a995bb7f..9fac6eb584 100644 --- a/.github/workflows/graph-parser.yml +++ b/.github/workflows/graph-parser.yml @@ -28,7 +28,7 @@ env: # This is the same as 1.8. JAVA_VERSION: '11' # This is the latest node version we can run. - NODE_VERSION: '22' + NODE_VERSION: '20' BABASHKA_VERSION: '1.0.168' jobs: diff --git a/.github/workflows/logseq-common.yml b/.github/workflows/logseq-common.yml index e4c63669c5..ccd32bf21e 100644 --- a/.github/workflows/logseq-common.yml +++ b/.github/workflows/logseq-common.yml @@ -23,7 +23,7 @@ env: CLOJURE_VERSION: '1.11.1.1413' JAVA_VERSION: '11' # This is the latest node version we can run. - NODE_VERSION: '22' + NODE_VERSION: '20' BABASHKA_VERSION: '1.0.168' jobs: diff --git a/.github/workflows/publishing.yml b/.github/workflows/publishing.yml index bd9d0ca568..30751540d4 100644 --- a/.github/workflows/publishing.yml +++ b/.github/workflows/publishing.yml @@ -28,7 +28,7 @@ env: # This is the same as 1.8. JAVA_VERSION: '11' # This is the latest node version we can run. - NODE_VERSION: '22' + NODE_VERSION: '20' BABASHKA_VERSION: '1.0.168' jobs: diff --git a/package.json b/package.json index b809cec993..6bae4b5510 100644 --- a/package.json +++ b/package.json @@ -113,7 +113,7 @@ "d3-force": "3.0.0", "diff": "5.0.0", "dompurify": "2.4.0", - "electron": "35.2.2", + "electron": "34.5.6", "electron-dl": "^4.0.0", "fs": "0.0.1-security", "fs-extra": "9.1.0", diff --git a/resources/package.json b/resources/package.json index 81137fe2a1..6874db8c2b 100644 --- a/resources/package.json +++ b/resources/package.json @@ -14,7 +14,7 @@ "electron:make-linux-arm64": "electron-forge make --platform=linux --arch=arm64", "electron:make-macos-arm64": "electron-forge make --platform=darwin --arch=arm64", "electron:publish:github": "electron-forge publish", - "rebuild:all": "electron-rebuild -v 35.2.2 -f", + "rebuild:all": "electron-rebuild -v 34.5.6 -f", "postinstall": "install-app-deps" }, "config": { @@ -55,12 +55,12 @@ "@electron-forge/maker-squirrel": "^7.8.0", "@electron-forge/maker-zip": "^7.8.0", "@electron/rebuild": "4.0.1", - "electron": "35.2.2", + "electron": "34.5.6", "electron-builder": "26.0.12", "electron-forge-maker-appimage": "https://github.com/logseq/electron-forge-maker-appimage.git" }, "resolutions": { - "**/electron": "35.2.2", + "**/electron": "34.5.6", "**/node-abi": "3.75.0", "**/node-gyp": "11.1.0", "string-width": "4.2.0", diff --git a/static/yarn.lock b/static/yarn.lock index ac7392e027..ac452c3c87 100644 --- a/static/yarn.lock +++ b/static/yarn.lock @@ -868,13 +868,20 @@ resolved "https://registry.yarnpkg.com/@types/ms/-/ms-2.1.0.tgz#052aa67a48eccc4309d7f0191b7e41434b90bb78" integrity sha512-GsCCIZDE/p3i96vtEqx+7dBUGXrc7zeSK3wwPHIaRThS+9OhWIXRqzs4d6k1SVU8g91DrNRWxWUGhp5KXQb2VA== -"@types/node@*", "@types/node@^22.7.7": +"@types/node@*": version "22.15.16" resolved "https://registry.yarnpkg.com/@types/node/-/node-22.15.16.tgz#685cf0338ad9f5b14860f50a6ac2c3ebd58582cd" integrity sha512-3pr+KjwpVujqWqOKT8mNR+rd09FqhBLwg+5L/4t0cNYBzm/yEiYGCxWttjaPBsLtAo+WFNoXzGJfolM1JuRXoA== dependencies: undici-types "~6.21.0" +"@types/node@^20.9.0": + version "20.17.50" + resolved "https://registry.yarnpkg.com/@types/node/-/node-20.17.50.tgz#d2640af991fc839ba746f799516fc6a4e47ebe50" + integrity sha512-Mxiq0ULv/zo1OzOhwPqOA13I81CV/W3nvd3ChtQZRT5Cwz3cr0FKo/wMSsbTqL3EXpaBAEQhva2B8ByRkOIh9A== + dependencies: + undici-types "~6.19.2" + "@types/plist@^3.0.1": version "3.0.5" resolved "https://registry.yarnpkg.com/@types/plist/-/plist-3.0.5.tgz#9a0c49c0f9886c8c8696a7904dd703f6284036e0" @@ -2044,13 +2051,13 @@ electron-wix-msi@^5.1.3: optionalDependencies: "@bitdisaster/exe-icon-extractor" "^1.0.10" -electron@*, electron@35.2.2: - version "35.2.2" - resolved "https://registry.yarnpkg.com/electron/-/electron-35.2.2.tgz#3eb16819eae70e492a9251cde4929687893e0c2e" - integrity sha512-jZnCOtIgrt28esWP5z/PKndj/vPQ/Zt+cvNRlb/qOGnK/AjW1mASwPMtQ099NlSodf69RR3JrhnZCYbTWeDR4g== +electron@*, electron@34.5.6: + version "34.5.6" + resolved "https://registry.yarnpkg.com/electron/-/electron-34.5.6.tgz#b18f1973df9846ff41ab98c7f9a25c35d5ebf731" + integrity sha512-cmP0CDnWFwyZrzn72AXS9oJiOjNIRPgKpGO2ykz3Syo+9B2RJ9WQzxOKkpntcWE5/nRsyFkRUCMTgGo3uNvCxQ== dependencies: "@electron/get" "^2.0.0" - "@types/node" "^22.7.7" + "@types/node" "^20.9.0" extract-zip "^2.0.1" emoji-regex@^8.0.0: @@ -4735,6 +4742,11 @@ typescript@^5.3.3, typescript@^5.4.3: resolved "https://registry.yarnpkg.com/typescript/-/typescript-5.8.3.tgz#92f8a3e5e3cf497356f4178c34cd65a7f5e8440e" integrity sha512-p1diW6TqL9L07nNxvRMM7hMMw4c5XOo/1ibL4aAIGmSAt9slTE1Xgw5KWuof2uTOvCg9BY7ZRi+GaF+7sfgPeQ== +undici-types@~6.19.2: + version "6.19.8" + resolved "https://registry.yarnpkg.com/undici-types/-/undici-types-6.19.8.tgz#35111c9d1437ab83a7cdc0abae2f26d88eda0a02" + integrity sha512-ve2KP6f/JnbPBFyobGHuerC9g1FYGn/F8n1LWTwNxCEzd6IfqTwUQcNXgEtmmQ6DlRrC1hrSrBnCZPokRrDHjw== + undici-types@~6.21.0: version "6.21.0" resolved "https://registry.yarnpkg.com/undici-types/-/undici-types-6.21.0.tgz#691d00af3909be93a7faa13be61b3a5b50ef12cb" diff --git a/yarn.lock b/yarn.lock index 5c15ee7d8b..32a7709aa1 100644 --- a/yarn.lock +++ b/yarn.lock @@ -936,13 +936,20 @@ resolved "https://registry.yarnpkg.com/@types/minimist/-/minimist-1.2.5.tgz#ec10755e871497bcd83efe927e43ec46e8c0747e" integrity sha512-hov8bUuiLiyFPGyFPE1lwWhmzYbirOXQNNo40+y3zow8aFVTeyn3VWL0VFFfdNddA8S4Vf0Tc062rzyNr7Paag== -"@types/node@*", "@types/node@^22.7.7": +"@types/node@*": version "22.15.16" resolved "https://registry.yarnpkg.com/@types/node/-/node-22.15.16.tgz#685cf0338ad9f5b14860f50a6ac2c3ebd58582cd" integrity sha512-3pr+KjwpVujqWqOKT8mNR+rd09FqhBLwg+5L/4t0cNYBzm/yEiYGCxWttjaPBsLtAo+WFNoXzGJfolM1JuRXoA== dependencies: undici-types "~6.21.0" +"@types/node@^20.9.0": + version "20.17.50" + resolved "https://registry.yarnpkg.com/@types/node/-/node-20.17.50.tgz#d2640af991fc839ba746f799516fc6a4e47ebe50" + integrity sha512-Mxiq0ULv/zo1OzOhwPqOA13I81CV/W3nvd3ChtQZRT5Cwz3cr0FKo/wMSsbTqL3EXpaBAEQhva2B8ByRkOIh9A== + dependencies: + undici-types "~6.19.2" + "@types/normalize-package-data@^2.4.0": version "2.4.4" resolved "https://registry.yarnpkg.com/@types/normalize-package-data/-/normalize-package-data-2.4.4.tgz#56e2cc26c397c038fab0e3a917a12d5c5909e901" @@ -2688,13 +2695,13 @@ electron-to-chromium@^1.5.149: resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.5.151.tgz#5edd6c17e1b2f14b4662c41b9379f96cc8c2bb7c" integrity sha512-Rl6uugut2l9sLojjS4H4SAr3A4IgACMLgpuEMPYCVcKydzfyPrn5absNRju38IhQOf/NwjJY8OGWjlteqYeBCA== -electron@35.2.2: - version "35.2.2" - resolved "https://registry.yarnpkg.com/electron/-/electron-35.2.2.tgz#3eb16819eae70e492a9251cde4929687893e0c2e" - integrity sha512-jZnCOtIgrt28esWP5z/PKndj/vPQ/Zt+cvNRlb/qOGnK/AjW1mASwPMtQ099NlSodf69RR3JrhnZCYbTWeDR4g== +electron@34.5.6: + version "34.5.6" + resolved "https://registry.yarnpkg.com/electron/-/electron-34.5.6.tgz#b18f1973df9846ff41ab98c7f9a25c35d5ebf731" + integrity sha512-cmP0CDnWFwyZrzn72AXS9oJiOjNIRPgKpGO2ykz3Syo+9B2RJ9WQzxOKkpntcWE5/nRsyFkRUCMTgGo3uNvCxQ== dependencies: "@electron/get" "^2.0.0" - "@types/node" "^22.7.7" + "@types/node" "^20.9.0" extract-zip "^2.0.1" element-resize-detector@^1.1.14: @@ -8250,6 +8257,11 @@ undertaker@^1.2.1: object.reduce "^1.0.0" undertaker-registry "^1.0.0" +undici-types@~6.19.2: + version "6.19.8" + resolved "https://registry.yarnpkg.com/undici-types/-/undici-types-6.19.8.tgz#35111c9d1437ab83a7cdc0abae2f26d88eda0a02" + integrity sha512-ve2KP6f/JnbPBFyobGHuerC9g1FYGn/F8n1LWTwNxCEzd6IfqTwUQcNXgEtmmQ6DlRrC1hrSrBnCZPokRrDHjw== + undici-types@~6.21.0: version "6.21.0" resolved "https://registry.yarnpkg.com/undici-types/-/undici-types-6.21.0.tgz#691d00af3909be93a7faa13be61b3a5b50ef12cb" From d077e58ac7ce40eddb61eb125b84124cc68188da Mon Sep 17 00:00:00 2001 From: Tienson Qin Date: Sat, 24 May 2025 16:29:00 +0800 Subject: [PATCH 3/5] downgrade @electron/rebuild --- resources/package.json | 2 +- static/yarn.lock | 30 +++++------------------------- 2 files changed, 6 insertions(+), 26 deletions(-) diff --git a/resources/package.json b/resources/package.json index 6874db8c2b..8f0a9f4ad0 100644 --- a/resources/package.json +++ b/resources/package.json @@ -54,7 +54,7 @@ "@electron-forge/maker-rpm": "^7.8.0", "@electron-forge/maker-squirrel": "^7.8.0", "@electron-forge/maker-zip": "^7.8.0", - "@electron/rebuild": "4.0.1", + "@electron/rebuild": "3.7.2", "electron": "34.5.6", "electron-builder": "26.0.12", "electron-forge-maker-appimage": "https://github.com/logseq/electron-forge-maker-appimage.git" diff --git a/static/yarn.lock b/static/yarn.lock index ac452c3c87..be496e0ca0 100644 --- a/static/yarn.lock +++ b/static/yarn.lock @@ -416,27 +416,7 @@ tar "^6.0.5" yargs "^17.0.1" -"@electron/rebuild@4.0.1": - version "4.0.1" - resolved "https://registry.yarnpkg.com/@electron/rebuild/-/rebuild-4.0.1.tgz#0620d5bb71a0b8b09a86fb9fa979244e1fcc10bf" - integrity sha512-iMGXb6Ib7H/Q3v+BKZJoETgF9g6KMNZVbsO4b7Dmpgb5qTFqyFTzqW9F3TOSHdybv2vKYKzSS9OiZL+dcJb+1Q== - dependencies: - "@malept/cross-spawn-promise" "^2.0.0" - chalk "^4.0.0" - debug "^4.1.1" - detect-libc "^2.0.1" - got "^11.7.0" - graceful-fs "^4.2.11" - node-abi "^4.2.0" - node-api-version "^0.2.1" - node-gyp "^11.2.0" - ora "^5.1.0" - read-binary-file-arch "^1.0.6" - semver "^7.3.5" - tar "^6.0.5" - yargs "^17.0.1" - -"@electron/rebuild@^3.7.0": +"@electron/rebuild@3.7.2", "@electron/rebuild@^3.7.0": version "3.7.2" resolved "https://registry.yarnpkg.com/@electron/rebuild/-/rebuild-3.7.2.tgz#8d808b29159c50086d27a5dec72b40bf16b4b582" integrity sha512-19/KbIR/DAxbsCkiaGMXIdPnMCJLkcf8AvGnduJtWBs/CBwiAjY1apCqOLVxrXg+rtXFCngbXhBanWjxLUt1Mg== @@ -2691,7 +2671,7 @@ got@^11.7.0, got@^11.8.5: p-cancelable "^2.0.0" responselike "^2.0.0" -graceful-fs@^4.1.2, graceful-fs@^4.1.6, graceful-fs@^4.2.0, graceful-fs@^4.2.11, graceful-fs@^4.2.6: +graceful-fs@^4.1.2, graceful-fs@^4.1.6, graceful-fs@^4.2.0, graceful-fs@^4.2.6: version "4.2.11" resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.11.tgz#4183e4e8bf08bb6e05bbb2f7d2e0c8f712ca40e3" integrity sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ== @@ -3547,7 +3527,7 @@ nice-try@^1.0.4: resolved "https://registry.yarnpkg.com/nice-try/-/nice-try-1.0.5.tgz#a3378a7696ce7d223e88fc9b764bd7ef1089e366" integrity sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ== -node-abi@3.75.0, node-abi@^3.3.0, node-abi@^3.45.0, node-abi@^4.2.0: +node-abi@3.75.0, node-abi@^3.3.0, node-abi@^3.45.0: version "3.75.0" resolved "https://registry.yarnpkg.com/node-abi/-/node-abi-3.75.0.tgz#2f929a91a90a0d02b325c43731314802357ed764" integrity sha512-OhYaY5sDsIka7H7AtijtI9jwGYLyl29eQn/W623DiN/MIv5sUqc4g7BIDThX+gb7di9f6xK02nkp8sdfFWZLTg== @@ -3564,7 +3544,7 @@ node-addon-api@^2.0.0: resolved "https://registry.yarnpkg.com/node-addon-api/-/node-addon-api-2.0.2.tgz#432cfa82962ce494b132e9d72a15b29f71ff5d32" integrity sha512-Ntyt4AIXyaLIuMHF6IOoTakB3K+RWxwtsHNRxllEoA6vPwP9o4866g6YWDLUdnucilZhmkxiHwHr11gAENw+QA== -node-api-version@^0.2.0, node-api-version@^0.2.1: +node-api-version@^0.2.0: version "0.2.1" resolved "https://registry.yarnpkg.com/node-api-version/-/node-api-version-0.2.1.tgz#19bad54f6d65628cbee4e607a325e4488ace2de9" integrity sha512-2xP/IGGMmmSQpI1+O/k72jF/ykvZ89JeuKX3TLJAYPDVLUalrshrLHkeVcCCZqG/eEa635cr8IBYzgnDvM2O8Q== @@ -3585,7 +3565,7 @@ node-fetch@^2.6.7: dependencies: whatwg-url "^5.0.0" -node-gyp@11.1.0, node-gyp@^11.2.0: +node-gyp@11.1.0: version "11.1.0" resolved "https://registry.yarnpkg.com/node-gyp/-/node-gyp-11.1.0.tgz#212a1d9c167c50d727d42659410780b40e07bbd3" integrity sha512-/+7TuHKnBpnMvUQnsYEb0JOozDZqarQbfNuSGLXIjhStMT0fbw7IdSqWgopOP5xhRZE+lsbIvAHcekddruPZgQ== From ed692638384d09a2e4577dbd1ce35044fe9fb334 Mon Sep 17 00:00:00 2001 From: Tienson Qin Date: Sat, 24 May 2025 23:53:51 +0800 Subject: [PATCH 4/5] chore: bump rsapi --- resources/package.json | 2 +- static/yarn.lock | 68 +++++++++++++++++++++--------------------- 2 files changed, 35 insertions(+), 35 deletions(-) diff --git a/resources/package.json b/resources/package.json index 8f0a9f4ad0..d389a713c3 100644 --- a/resources/package.json +++ b/resources/package.json @@ -22,7 +22,7 @@ }, "dependencies": { "@fastify/cors": "11.0.1", - "@logseq/rsapi": "0.0.91", + "@logseq/rsapi": "0.0.92", "@sentry/electron": "2.5.1", "abort-controller": "3.0.0", "better-sqlite3": "11.9.1", diff --git a/static/yarn.lock b/static/yarn.lock index be496e0ca0..d2ecd4bca4 100644 --- a/static/yarn.lock +++ b/static/yarn.lock @@ -559,47 +559,47 @@ dependencies: minipass "^7.0.4" -"@logseq/rsapi-darwin-arm64@0.0.91": - version "0.0.91" - resolved "https://registry.yarnpkg.com/@logseq/rsapi-darwin-arm64/-/rsapi-darwin-arm64-0.0.91.tgz#e29cd37a372609b04d7dcfc7ae4c1405c7a54353" - integrity sha512-t3xbU7qLeXSNZMmYioCPp7FY250Y2w6W/UaFrQKkyJ0Id2hCAomM9zKxGrTEFeN9Oo5sQtIw2RGiQOTxNX2tEw== +"@logseq/rsapi-darwin-arm64@0.0.92": + version "0.0.92" + resolved "https://registry.yarnpkg.com/@logseq/rsapi-darwin-arm64/-/rsapi-darwin-arm64-0.0.92.tgz#8826d11c5e1e4a1540aeae10b3725bf1dd185d6c" + integrity sha512-Fak9tz9TsGOzOkrm5wI9R0gnRsNTRpj5F2QwIPEC6XThKCYsrNUxMvmDzlL0TSTE1T6EEfxdYZUgd/spTs5zGA== -"@logseq/rsapi-darwin-x64@0.0.91": - version "0.0.91" - resolved "https://registry.yarnpkg.com/@logseq/rsapi-darwin-x64/-/rsapi-darwin-x64-0.0.91.tgz#926df44bb030aa3eacdf0cf1e9140ed44cdfad1e" - integrity sha512-D8qknMzWEuCUKJfkSUKlp3HqQZ2OAhCVm2AnLp7cr/4gjznaiiuAe5/6I7arrI6FqVp2I2x5+hPsG/SXKimNSg== +"@logseq/rsapi-darwin-x64@0.0.92": + version "0.0.92" + resolved "https://registry.yarnpkg.com/@logseq/rsapi-darwin-x64/-/rsapi-darwin-x64-0.0.92.tgz#645e7890783e20e8602668e97a92597e20d65d25" + integrity sha512-AyxuRlNNNwAnnF2sojWJO978rwntJaK6owtDS3EJSN+LmKPn8sEcQ6l5ChMVIzjcZHAjFvc+FVuxTwOeEExJUQ== -"@logseq/rsapi-freebsd-x64@0.0.91": - version "0.0.91" - resolved "https://registry.yarnpkg.com/@logseq/rsapi-freebsd-x64/-/rsapi-freebsd-x64-0.0.91.tgz#48411e70ddf7e8abcc5d894281cb6191f295912b" - integrity sha512-OLgaR3f+RiXMANK4+75cPDK0cqM/LMrOHalvJ4py2P9NoaxO+51whQ/5B4oR+mty9of4h37rNxZ+3oDvgOAFfA== +"@logseq/rsapi-freebsd-x64@0.0.92": + version "0.0.92" + resolved "https://registry.yarnpkg.com/@logseq/rsapi-freebsd-x64/-/rsapi-freebsd-x64-0.0.92.tgz#49b36ab2e74e3243ae5c53f88f28ff752a048b30" + integrity sha512-Bu2yXMCzYN4Kwv93/qnetOQ30zfHb5DwjSMvaApqMxTkg/b2b+VBJSm+KgB9fPP8gyYAp9jYHFEriGGRqm0V4Q== -"@logseq/rsapi-linux-arm64-gnu@0.0.91": - version "0.0.91" - resolved "https://registry.yarnpkg.com/@logseq/rsapi-linux-arm64-gnu/-/rsapi-linux-arm64-gnu-0.0.91.tgz#a7bcdf1db9060718e425b12cf59eaec56e0d0c77" - integrity sha512-ZpSM/4/29BsM7VVYUXXpk8fyHv2rezhHpH2G3I36jW5bwTFklptmugaeOEhCgRvr70mduSHAPap8McN9NVwRew== +"@logseq/rsapi-linux-arm64-gnu@0.0.92": + version "0.0.92" + resolved "https://registry.yarnpkg.com/@logseq/rsapi-linux-arm64-gnu/-/rsapi-linux-arm64-gnu-0.0.92.tgz#b983c76f21b23579050b8c7cd53f27f09581dc9f" + integrity sha512-DKeixTnCdNAaVd3w2b095OpHextsP0e12UR/wtR7l096PLE3o0GzOamQSWmVMYhyySlpdSfv4mZvvTtG7QEfdw== -"@logseq/rsapi-linux-x64-gnu@0.0.91": - version "0.0.91" - resolved "https://registry.yarnpkg.com/@logseq/rsapi-linux-x64-gnu/-/rsapi-linux-x64-gnu-0.0.91.tgz#eef06a6b2020e3540e009aa80de08d7f568eb48c" - integrity sha512-tDLSPQm86DHip3GABW7hAEGH3d0Fu4oiHe3c5tte2EP4y8YE7dKNccFgDYcCIqmiRdB/SxYS1lDCThDrvmGLqA== +"@logseq/rsapi-linux-x64-gnu@0.0.92": + version "0.0.92" + resolved "https://registry.yarnpkg.com/@logseq/rsapi-linux-x64-gnu/-/rsapi-linux-x64-gnu-0.0.92.tgz#8ebb3324c8681c1f44f6d6b6364dca18c9c5ee29" + integrity sha512-FyvNgMB2EiHn3R22dhDsXw5p4BDc5dpKMbomu+6G4X9Bet6MzIxam3vToS/OelUwGErwbFjtdDswpBVrhe5WFg== -"@logseq/rsapi-win32-x64-msvc@0.0.91": - version "0.0.91" - resolved "https://registry.yarnpkg.com/@logseq/rsapi-win32-x64-msvc/-/rsapi-win32-x64-msvc-0.0.91.tgz#b883cc9f1e8877e171b905b55f1cf962009eeb2f" - integrity sha512-+9v4WjNZt2IxWFqxyEokT9TDP3WacvEo0XdxJ68qp6Enn5728yM/ptsTQApy3GVxFFrfiHigogOqVi6y/pJI9A== +"@logseq/rsapi-win32-x64-msvc@0.0.92": + version "0.0.92" + resolved "https://registry.yarnpkg.com/@logseq/rsapi-win32-x64-msvc/-/rsapi-win32-x64-msvc-0.0.92.tgz#c3bb8e88c92da0a0289625da32d04c64c54668e7" + integrity sha512-EWv+IfKo5f7QOSFkmousMJAaetpCZL08h+qTg73YhWPxenZALQr35qwWykbUASraERwjsxkTFimv86lXMu/GZw== -"@logseq/rsapi@0.0.91": - version "0.0.91" - resolved "https://registry.yarnpkg.com/@logseq/rsapi/-/rsapi-0.0.91.tgz#542fd9119542d811bee71a0bb74df11f8d6227ae" - integrity sha512-3YVnUw1ZbGwUmCXCwcJPAmys6M6wLsfEL3ibti3CupcmzWvi/wjejE9YnRYZ0RBUGNddtF0+PN6nDKBdLwTM4A== +"@logseq/rsapi@0.0.92": + version "0.0.92" + resolved "https://registry.yarnpkg.com/@logseq/rsapi/-/rsapi-0.0.92.tgz#fac6834098a0280d923f0d68c71041b949d5a304" + integrity sha512-HR6HN9Q2SlYegPD5yLd7S5LOyZVwwHhJAYwdx8AE9Rc+wwD+tLEHEbamG0ocTZdcbjl7YERnYOhd7eH9fUncfQ== optionalDependencies: - "@logseq/rsapi-darwin-arm64" "0.0.91" - "@logseq/rsapi-darwin-x64" "0.0.91" - "@logseq/rsapi-freebsd-x64" "0.0.91" - "@logseq/rsapi-linux-arm64-gnu" "0.0.91" - "@logseq/rsapi-linux-x64-gnu" "0.0.91" - "@logseq/rsapi-win32-x64-msvc" "0.0.91" + "@logseq/rsapi-darwin-arm64" "0.0.92" + "@logseq/rsapi-darwin-x64" "0.0.92" + "@logseq/rsapi-freebsd-x64" "0.0.92" + "@logseq/rsapi-linux-arm64-gnu" "0.0.92" + "@logseq/rsapi-linux-x64-gnu" "0.0.92" + "@logseq/rsapi-win32-x64-msvc" "0.0.92" "@malept/cross-spawn-promise@^1.0.0", "@malept/cross-spawn-promise@^1.1.0": version "1.1.1" From 9043a5d37b9fd5e435f0375416bf4dbf619da0d6 Mon Sep 17 00:00:00 2001 From: Tienson Qin Date: Sun, 25 May 2025 18:15:50 +0800 Subject: [PATCH 5/5] chore: bump to 0.10.12 --- android/app/build.gradle | 4 ++-- ios/App/App.xcodeproj/project.pbxproj | 8 ++++---- resources/forge.config.js | 2 +- resources/package.json | 2 +- src/main/frontend/version.cljs | 2 +- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/android/app/build.gradle b/android/app/build.gradle index d587b026b9..940ea91a38 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -7,8 +7,8 @@ android { applicationId "com.logseq.app" minSdkVersion rootProject.ext.minSdkVersion targetSdkVersion rootProject.ext.targetSdkVersion - versionCode 86 - versionName "0.10.11" + versionCode 87 + versionName "0.10.12" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" aaptOptions { // Files and dirs to omit from the packaged assets dir, modified to accommodate modern web apps. diff --git a/ios/App/App.xcodeproj/project.pbxproj b/ios/App/App.xcodeproj/project.pbxproj index 28593eb283..6162f313d8 100644 --- a/ios/App/App.xcodeproj/project.pbxproj +++ b/ios/App/App.xcodeproj/project.pbxproj @@ -519,7 +519,7 @@ INFOPLIST_FILE = App/Info.plist; IPHONEOS_DEPLOYMENT_TARGET = 14.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; - MARKETING_VERSION = 0.10.11; + MARKETING_VERSION = 0.10.12; OTHER_SWIFT_FLAGS = "$(inherited) \"-D\" \"COCOAPODS\" \"-DDEBUG\""; PRODUCT_BUNDLE_IDENTIFIER = com.logseq.logseq; PRODUCT_NAME = "$(TARGET_NAME)"; @@ -546,7 +546,7 @@ INFOPLIST_FILE = App/Info.plist; IPHONEOS_DEPLOYMENT_TARGET = 14.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; - MARKETING_VERSION = 0.10.11; + MARKETING_VERSION = 0.10.12; PRODUCT_BUNDLE_IDENTIFIER = com.logseq.logseq; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_ACTIVE_COMPILATION_CONDITIONS = ""; @@ -571,7 +571,7 @@ INFOPLIST_KEY_NSHumanReadableCopyright = ""; IPHONEOS_DEPLOYMENT_TARGET = 14.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @executable_path/../../Frameworks"; - MARKETING_VERSION = 0.10.11; + MARKETING_VERSION = 0.10.12; MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE; MTL_FAST_MATH = YES; PRODUCT_BUNDLE_IDENTIFIER = com.logseq.logseq.ShareViewController; @@ -598,7 +598,7 @@ INFOPLIST_KEY_NSHumanReadableCopyright = ""; IPHONEOS_DEPLOYMENT_TARGET = 14.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @executable_path/../../Frameworks"; - MARKETING_VERSION = 0.10.11; + MARKETING_VERSION = 0.10.12; MTL_FAST_MATH = YES; PRODUCT_BUNDLE_IDENTIFIER = com.logseq.logseq.ShareViewController; PRODUCT_NAME = "$(TARGET_NAME)"; diff --git a/resources/forge.config.js b/resources/forge.config.js index aa91c34ea4..f3c32ba4a5 100644 --- a/resources/forge.config.js +++ b/resources/forge.config.js @@ -5,7 +5,7 @@ module.exports = { packagerConfig: { name: 'Logseq', icon: './icons/logseq_big_sur.icns', - buildVersion: '86', + buildVersion: "87", protocols: [ { "protocol": "logseq", diff --git a/resources/package.json b/resources/package.json index d389a713c3..6e017a1e8a 100644 --- a/resources/package.json +++ b/resources/package.json @@ -1,7 +1,7 @@ { "name": "Logseq", "productName": "Logseq", - "version": "0.10.11", + "version": "0.10.12", "main": "electron.js", "author": "Logseq", "license": "AGPL-3.0", diff --git a/src/main/frontend/version.cljs b/src/main/frontend/version.cljs index 0c8ca61941..97283450b9 100644 --- a/src/main/frontend/version.cljs +++ b/src/main/frontend/version.cljs @@ -1,3 +1,3 @@ (ns ^:no-doc frontend.version) -(defonce version "0.10.11") +(defonce version "0.10.12")