From f080fb38a2d55635abd2bc930b3159b66eadddf6 Mon Sep 17 00:00:00 2001 From: Bad3r Date: Mon, 11 Sep 2023 06:21:19 -0400 Subject: [PATCH 1/2] chore(deps): upgrade electron from v24 to v25 --- package.json | 2 +- resources/package.json | 6 +++--- static/yarn.lock | 8 ++++---- yarn.lock | 8 ++++---- 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/package.json b/package.json index 2d5cb7163ce..5bd61acc4c5 100644 --- a/package.json +++ b/package.json @@ -110,7 +110,7 @@ "d3-force": "3.0.0", "diff": "5.0.0", "dompurify": "2.4.0", - "electron": "24.6.3", + "electron": "25.8.2", "electron-dl": "3.3.0", "fs": "0.0.1-security", "fs-extra": "9.1.0", diff --git a/resources/package.json b/resources/package.json index a288387b2a7..41fe694922c 100644 --- a/resources/package.json +++ b/resources/package.json @@ -13,7 +13,7 @@ "electron:make": "electron-forge make", "electron:make-macos-arm64": "electron-forge make --platform=darwin --arch=arm64", "electron:publish:github": "electron-forge publish", - "rebuild:all": "electron-rebuild -v 24.6.3 -f", + "rebuild:all": "electron-rebuild -v 25.8.2 -f", "postinstall": "install-app-deps" }, "config": { @@ -53,12 +53,12 @@ "@electron-forge/maker-squirrel": "^6.0.4", "@electron-forge/maker-zip": "^6.0.4", "@electron/rebuild": "3.2.10", - "electron": "24.6.3", + "electron": "25.8.2", "electron-builder": "^22.11.7", "electron-forge-maker-appimage": "https://github.com/logseq/electron-forge-maker-appimage.git" }, "resolutions": { - "**/electron": "24.6.3", + "**/electron": "25.8.2", "**/node-gyp": "9.0.0" } } diff --git a/static/yarn.lock b/static/yarn.lock index f5c6f70459b..afd27c983bf 100644 --- a/static/yarn.lock +++ b/static/yarn.lock @@ -2093,10 +2093,10 @@ electron-winstaller@^5.0.0: lodash.template "^4.2.2" temp "^0.9.0" -electron@*, electron@24.6.3: - version "24.6.3" - resolved "https://registry.yarnpkg.com/electron/-/electron-24.6.3.tgz#fc41279a5ec7b0aa3d48128df61fa29ca8a21199" - integrity sha512-hWy2ot0987DRzhOxIyv9tgybd0yrAcc9MRFYZ+znjXgdmbvcSveXdcGKGdtpgw1EW/TKUonJMH3VfDNeAmdPUg== +electron@*, electron@25.8.2: + version "25.8.2" + resolved "https://registry.yarnpkg.com/electron/-/electron-25.8.2.tgz#5e8ea742b68a7d1427bf78902ec40a5b7231a58b" + integrity sha512-AM1ra6b16EQuO1bJtiA8ZiWqqFLLgVfxD56ykiy+EA5C63Hkx8OmIbe+5JAsLiTwRVvBZ4oCAj6wa2qT+iq8ww== dependencies: "@electron/get" "^2.0.0" "@types/node" "^18.11.18" diff --git a/yarn.lock b/yarn.lock index b200031bb24..594c3eab90a 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2659,10 +2659,10 @@ electron-to-chromium@^1.4.251: resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.284.tgz#61046d1e4cab3a25238f6bf7413795270f125592" integrity sha512-M8WEXFuKXMYMVr45fo8mq0wUrrJHheiKZf6BArTKk9ZBYCKJEOU5H8cdWgDT+qCVZf7Na4lVUaZsA+h6uA9+PA== -electron@24.6.3: - version "24.6.3" - resolved "https://registry.yarnpkg.com/electron/-/electron-24.6.3.tgz#fc41279a5ec7b0aa3d48128df61fa29ca8a21199" - integrity sha512-hWy2ot0987DRzhOxIyv9tgybd0yrAcc9MRFYZ+znjXgdmbvcSveXdcGKGdtpgw1EW/TKUonJMH3VfDNeAmdPUg== +electron@25.8.2: + version "25.8.2" + resolved "https://registry.yarnpkg.com/electron/-/electron-25.8.2.tgz#5e8ea742b68a7d1427bf78902ec40a5b7231a58b" + integrity sha512-AM1ra6b16EQuO1bJtiA8ZiWqqFLLgVfxD56ykiy+EA5C63Hkx8OmIbe+5JAsLiTwRVvBZ4oCAj6wa2qT+iq8ww== dependencies: "@electron/get" "^2.0.0" "@types/node" "^18.11.18" From 085a41af846452bf8dad8f272b543a05675da219 Mon Sep 17 00:00:00 2001 From: snyk-bot Date: Thu, 26 Oct 2023 15:31:20 +0000 Subject: [PATCH 2/2] fix: upgrade electron-dl from 3.3.0 to 3.5.1 Snyk has created this PR to upgrade electron-dl from 3.3.0 to 3.5.1. See this package in npm: https://www.npmjs.com/package/electron-dl See this project in Snyk: https://app.snyk.io/org/bad3r/project/b7588bf4-930b-4b58-8fc4-326d9ef0b1ad?utm_source=github&utm_medium=referral&page=upgrade-pr --- resources/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/package.json b/resources/package.json index 41fe694922c..4b79d7c7a73 100644 --- a/resources/package.json +++ b/resources/package.json @@ -23,7 +23,7 @@ "better-sqlite3": "8.0.1", "chokidar": "^3.5.1", "dugite": "2.5.0", - "electron-dl": "3.3.0", + "electron-dl": "3.5.1", "electron-log": "4.3.1", "electron-squirrel-startup": "1.0.0", "electron-window-state": "5.0.3",