From 97669c46e2cae5ba59441e69e1c8272473006aff Mon Sep 17 00:00:00 2001 From: Tienson Qin Date: Sat, 24 May 2025 16:16:12 +0800 Subject: [PATCH] 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"