self-hosted/joplin
1
0
Fork 0
mirror of https://github.com/laurent22/joplin.git synced 2025-02-13 19:42:36 +02:00
Code Issues Releases Activity

Desktop: Upgrade to Electron 34 (#11665)

Browse Source
This commit is contained in:
Henry Heino 2025-01-18 04:36:39 -08:00 committed by GitHub
parent dbd4cffef3
commit b2c1d7a2ba
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
packages/app-desktop/package.json
View File

@ -144,7 +144,7 @@
"@types/styled-components": "5.1.32", "@types/styled-components": "5.1.32",
"@types/tesseract.js": "2.0.0", "@types/tesseract.js": "2.0.0",
"axios": "^1.7.7", "axios": "^1.7.7",
"electron": "32.2.0", "electron": "34.0.0",
"electron-builder": "24.13.3", "electron-builder": "24.13.3",
"glob": "10.4.5", "glob": "10.4.5",
"gulp": "4.0.2", "gulp": "4.0.2",

2
packages/app-desktop/tools/electronRebuild.js
View File

@ -25,7 +25,7 @@ async function main() {
// wrong one. However it means it will have to be manually upgraded for each // wrong one. However it means it will have to be manually upgraded for each
// new Electron release. Some ABI map there: // new Electron release. Some ABI map there:
// https://github.com/electron/node-abi/tree/master/test // https://github.com/electron/node-abi/tree/master/test
const forceAbiArgs = '--force-abi 128'; const forceAbiArgs = '--force-abi 132';
if (isWindows()) { if (isWindows()) {
// Cannot run this in parallel, or the 64-bit version might end up // Cannot run this in parallel, or the 64-bit version might end up

10
yarn.lock
View File

@ -8297,7 +8297,7 @@ __metadata:
compare-versions: 6.1.1 compare-versions: 6.1.1
countable: 3.0.1 countable: 3.0.1
debounce: 1.2.1 debounce: 1.2.1
electron: 32.2.0 electron: 34.0.0
electron-builder: 24.13.3 electron-builder: 24.13.3
electron-updater: 6.2.1 electron-updater: 6.2.1
electron-window-state: 5.0.3 electron-window-state: 5.0.3
@ -22937,16 +22937,16 @@ __metadata:
languageName: node languageName: node
linkType: hard linkType: hard
"electron@npm:32.2.0": "electron@npm:34.0.0":
version: 32.2.0 version: 34.0.0
resolution: "electron@npm:32.2.0" resolution: "electron@npm:34.0.0"
dependencies: dependencies:
"@electron/get": ^2.0.0 "@electron/get": ^2.0.0
"@types/node": ^20.9.0 "@types/node": ^20.9.0
extract-zip: ^2.0.1 extract-zip: ^2.0.1
bin: bin:
electron: cli.js electron: cli.js
checksum: c8ae07d9cf361b1aa6fd0726d1acb78e47ba8b821f62a007b3c56764861e598428a806ed14e288278f89a013598bde38d24ecccfccd09d26e84f6770d7e7717c checksum: 0ee9a4bb3444cf13f8d0eeef928f9d8feee33d919c414672d794d6332d81fe3740c781060eba5374417742dd9f8159da2050c0fc14fac64d143be8ccb53e280c
languageName: node languageName: node
linkType: hard linkType: hard