self-hosted/joplin
1
0
Fork 0
mirror of https://github.com/laurent22/joplin.git synced 2025-01-02 12:47:41 +02:00
Code Issues Releases Activity

Desktop: Upgrade to Electron 32.2.0 (#11200)

Browse Source
This commit is contained in:
Henry Heino 2024-10-26 13:02:29 -07:00 committed by GitHub
parent 9f5282c8f5
commit c6d319e333
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
6 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
packages/app-desktop/bridge.ts
View File

@ -452,8 +452,7 @@ export class Bridge {
return nativeTheme.shouldUseDarkColors; return nativeTheme.shouldUseDarkColors;
} }
// eslint-disable-next-line @typescript-eslint/ban-types -- Old code before rule was applied public addEventListener(name: string, fn: ()=> void) {
public addEventListener(name: string, fn: Function) {
if (name === 'nativeThemeUpdated') { if (name === 'nativeThemeUpdated') {
nativeTheme.on('updated', fn); nativeTheme.on('updated', fn);
} else { } else {

2
packages/app-desktop/gui/NoteTextViewer.tsx
View File

@ -232,7 +232,7 @@ export default class NoteTextViewerComponent extends React.Component<Props, any>
className="noteTextViewer" className="noteTextViewer"
ref={this.webviewRef_} ref={this.webviewRef_}
style={viewerStyle} style={viewerStyle}
allow='fullscreen=* autoplay=* local-fonts=* encrypted-media=*' allow='clipboard-write=(self) fullscreen=(self) autoplay=(self) local-fonts=(self) encrypted-media=(self)'
allowFullScreen={true} allowFullScreen={true}
src={`joplin-content://note-viewer/${__dirname}/note-viewer/index.html`} src={`joplin-content://note-viewer/${__dirname}/note-viewer/index.html`}
></iframe> ></iframe>

4
packages/app-desktop/integration-tests/util/setMessageBoxResponse.ts
View File

@ -1,9 +1,9 @@
import { ElectronApplication } from '@playwright/test'; import { ElectronApplication } from '@playwright/test';
import { BrowserWindow, MessageBoxOptions } from 'electron'; import { BaseWindow, MessageBoxOptions } from 'electron';
const setMessageBoxResponse = (electronApp: ElectronApplication, responseMatch: RegExp) => { const setMessageBoxResponse = (electronApp: ElectronApplication, responseMatch: RegExp) => {
return electronApp.evaluate(async ({ dialog }, responseMatch) => { return electronApp.evaluate(async ({ dialog }, responseMatch) => {
type DialogArgsType = [ BrowserWindow, MessageBoxOptions ]|[MessageBoxOptions]; type DialogArgsType = [ BaseWindow, MessageBoxOptions ]|[MessageBoxOptions];
const getMatchingButton = (dialogArgs: DialogArgsType) => { const getMatchingButton = (dialogArgs: DialogArgsType) => {
const matchingButton = (options: MessageBoxOptions) => { const matchingButton = (options: MessageBoxOptions) => {

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

@ -137,7 +137,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": "29.4.5", "electron": "32.2.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 122'; const forceAbiArgs = '--force-abi 128';
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

@ -7411,7 +7411,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: 29.4.5 electron: 32.2.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
@ -21149,16 +21149,16 @@ __metadata:
languageName: node languageName: node
linkType: hard linkType: hard
"electron@npm:29.4.5": "electron@npm:32.2.0":
version: 29.4.5 version: 32.2.0
resolution: "electron@npm:29.4.5" resolution: "electron@npm:32.2.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: 8c90671ddbde19e3bb4a5e0544e42204b13d1d75f4f96343b400754956a750262c1ad9574f479c0c3b7e90444e675f40a3f61e5374a8bb6f6de45eb6417a7f4f checksum: c8ae07d9cf361b1aa6fd0726d1acb78e47ba8b821f62a007b3c56764861e598428a806ed14e288278f89a013598bde38d24ecccfccd09d26e84f6770d7e7717c
languageName: node languageName: node
linkType: hard linkType: hard