aaron/mattermost-desktop
1
0
Fork 0
Code Issues Pull requests Actions 1 Packages Projects Releases Wiki Activity

Upgrade to Electron v26.1.0 (#2808)

Browse source 
* Upgrade to Electron v26.1.0

* Fix TS issues

---------

Co-authored-by: Devin Binnie <devin.binnie@mattermost.com>
This commit is contained in:
Florian Apolloner 2023-08-29 15:19:29 +02:00 committed by GitHub
parent d8a42d68db
commit f581f439df
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
7 changed files with 14 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
package-lock.json generated
View file

@ -50,7 +50,7 @@
"copy-webpack-plugin": "10.2.4", "copy-webpack-plugin": "10.2.4",
"cross-env": "7.0.3", "cross-env": "7.0.3",
"css-loader": "6.7.1", "css-loader": "6.7.1",
"electron": "24.6.3", "electron": "26.1.0",
"electron-builder": "23.3.3", "electron-builder": "23.3.3",
"electron-connect": "0.6.3", "electron-connect": "0.6.3",
"electron-context-menu": "3.6.1", "electron-context-menu": "3.6.1",
@ -15930,9 +15930,9 @@
} }
}, },
"node_modules/electron": { "node_modules/electron": {
"version": "24.6.3", "version": "26.1.0",
"resolved": "https://registry.npmjs.org/electron/-/electron-24.6.3.tgz", "resolved": "https://registry.npmjs.org/electron/-/electron-26.1.0.tgz",
"integrity": "sha512-hWy2ot0987DRzhOxIyv9tgybd0yrAcc9MRFYZ+znjXgdmbvcSveXdcGKGdtpgw1EW/TKUonJMH3VfDNeAmdPUg==", "integrity": "sha512-qEh19H09Pysn3ibms5nZ0haIh5pFoOd7/5Ww7gzmAwDQOulRi8Sa2naeueOyIb1GKpf+6L4ix3iceYRAuA5r5Q==",
"dev": true, "dev": true,
"hasInstallScript": true, "hasInstallScript": true,
"dependencies": { "dependencies": {
@ -46146,9 +46146,9 @@
} }
}, },
"electron": { "electron": {
"version": "24.6.3", "version": "26.1.0",
"resolved": "https://registry.npmjs.org/electron/-/electron-24.6.3.tgz", "resolved": "https://registry.npmjs.org/electron/-/electron-26.1.0.tgz",
"integrity": "sha512-hWy2ot0987DRzhOxIyv9tgybd0yrAcc9MRFYZ+znjXgdmbvcSveXdcGKGdtpgw1EW/TKUonJMH3VfDNeAmdPUg==", "integrity": "sha512-qEh19H09Pysn3ibms5nZ0haIh5pFoOd7/5Ww7gzmAwDQOulRi8Sa2naeueOyIb1GKpf+6L4ix3iceYRAuA5r5Q==",
"dev": true, "dev": true,
"requires": { "requires": {
"@electron/get": "^2.0.0", "@electron/get": "^2.0.0",

4
package.json
View file

@ -16,7 +16,7 @@
"url": "git://github.com/mattermost/desktop.git" "url": "git://github.com/mattermost/desktop.git"
}, },
"config": { "config": {
"target": "24.6.3", "target": "26.1.0",
"arch": "x64", "arch": "x64",
"target_arch": "x64", "target_arch": "x64",
"disturl": "https://electronjs.org/headers", "disturl": "https://electronjs.org/headers",
@ -168,7 +168,7 @@
"copy-webpack-plugin": "10.2.4", "copy-webpack-plugin": "10.2.4",
"cross-env": "7.0.3", "cross-env": "7.0.3",
"css-loader": "6.7.1", "css-loader": "6.7.1",
"electron": "24.6.3", "electron": "26.1.0",
"electron-builder": "23.3.3", "electron-builder": "23.3.3",
"electron-connect": "0.6.3", "electron-connect": "0.6.3",
"electron-context-menu": "3.6.1", "electron-context-menu": "3.6.1",

2
src/main/authManager.ts
View file

@ -1,6 +1,6 @@
// Copyright (c) 2016-present Mattermost, Inc. All Rights Reserved. // Copyright (c) 2016-present Mattermost, Inc. All Rights Reserved.
// See LICENSE.txt for license information. // See LICENSE.txt for license information.
import {AuthenticationResponseDetails, AuthInfo, WebContents} from 'electron'; import {AuthenticationResponseDetails, AuthInfo, WebContents, Event} from 'electron';
import {PermissionType} from 'types/trustedOrigin'; import {PermissionType} from 'types/trustedOrigin';
import {LoginModalData} from 'types/auth'; import {LoginModalData} from 'types/auth';

2
src/main/certificateManager.ts
View file

@ -1,7 +1,7 @@
// Copyright (c) 2016-present Mattermost, Inc. All Rights Reserved. // Copyright (c) 2016-present Mattermost, Inc. All Rights Reserved.
// See LICENSE.txt for license information. // See LICENSE.txt for license information.
import {Certificate, WebContents} from 'electron'; import {Certificate, WebContents, Event} from 'electron';
import {CertificateModalData} from 'types/certificate'; import {CertificateModalData} from 'types/certificate';

2
src/main/views/viewManager.ts
View file

@ -1,7 +1,7 @@
// Copyright (c) 2016-present Mattermost, Inc. All Rights Reserved. // Copyright (c) 2016-present Mattermost, Inc. All Rights Reserved.
// See LICENSE.txt for license information. // See LICENSE.txt for license information.
import {BrowserView, dialog, ipcMain, IpcMainEvent, IpcMainInvokeEvent} from 'electron'; import {BrowserView, dialog, ipcMain, IpcMainEvent, IpcMainInvokeEvent, Event} from 'electron';
import ServerViewState from 'app/serverViewState'; import ServerViewState from 'app/serverViewState';

2
src/main/views/webContentEvents.ts
View file

@ -1,7 +1,7 @@
// Copyright (c) 2016-present Mattermost, Inc. All Rights Reserved. // Copyright (c) 2016-present Mattermost, Inc. All Rights Reserved.
// See LICENSE.txt for license information. // See LICENSE.txt for license information.
import {BrowserWindow, session, shell, WebContents} from 'electron'; import {BrowserWindow, session, shell, WebContents, Event} from 'electron';
import Config from 'common/config'; import Config from 'common/config';
import {Logger} from 'common/log'; import {Logger} from 'common/log';

2
src/main/windows/callsWidgetWindow.ts
View file

@ -1,7 +1,7 @@
// Copyright (c) 2016-present Mattermost, Inc. All Rights Reserved. // Copyright (c) 2016-present Mattermost, Inc. All Rights Reserved.
// See LICENSE.txt for license information. // See LICENSE.txt for license information.
import {BrowserWindow, desktopCapturer, ipcMain, IpcMainEvent, Rectangle, systemPreferences} from 'electron'; import {BrowserWindow, desktopCapturer, ipcMain, IpcMainEvent, Rectangle, systemPreferences, Event} from 'electron';
import { import {
CallsErrorMessage, CallsErrorMessage,