if/SymphonyElectron
1
0
Fork 0
mirror of https://github.com/finos/SymphonyElectron.git synced 2025-02-25 18:55:29 -06:00
Code Issues Packages Projects Releases Wiki Activity

SDA-4587 - Bump electron version (#2164)

Browse Source 
* SDA-4587 - Add safety check for main view

* SDA-4587 - Upgrade electron version to 30.1.0
This commit is contained in:
Kiran Niranjan 2024-06-17 13:45:17 +05:30 committed by GitHub
parent a6a72e7d7c
commit eb5b0a46c8
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
package-lock.json generated
View File

@ -1,12 +1,12 @@
{ {
"name": "symphony", "name": "symphony",
"version": "24.7.0", "version": "24.8.0",
"lockfileVersion": 2, "lockfileVersion": 2,
"requires": true, "requires": true,
"packages": { "packages": {
"": { "": {
"name": "symphony", "name": "symphony",
"version": "24.7.0", "version": "24.8.0",
"hasInstallScript": true, "hasInstallScript": true,
"license": "Apache-2.0", "license": "Apache-2.0",
"dependencies": { "dependencies": {
@ -40,7 +40,7 @@
"builder-util-runtime": "^9.0.3", "builder-util-runtime": "^9.0.3",
"cross-env": "7.0.3", "cross-env": "7.0.3",
"del": "3.0.0", "del": "3.0.0",
"electron": "29.3.1", "electron": "30.1.0",
"electron-builder": "^24.13.2", "electron-builder": "^24.13.2",
"electron-devtools-installer": "^3.2.0", "electron-devtools-installer": "^3.2.0",
"electron-icon-maker": "0.0.5", "electron-icon-maker": "0.0.5",
@ -6338,9 +6338,9 @@
} }
}, },
"node_modules/electron": { "node_modules/electron": {
"version": "29.3.1", "version": "30.1.0",
"resolved": "https://repo.symphony.com/artifactory/api/npm/npm-virtual-dev/electron/-/electron-29.3.1.tgz", "resolved": "https://repo.symphony.com/artifactory/api/npm/npm-virtual-dev/electron/-/electron-30.1.0.tgz",
"integrity": "sha512-auge1/6RVqgUd6TgIq88wKdUCJi2cjESi3jy7d+6X4JzvBGprKBqMJ8JSSFpu/Px1YJrFUKAxfy6SC+TQf1uLw==", "integrity": "sha512-9O8m7kinjwMH5Df0hpXbwUaqI6pk3aJm1sKQUkQGCF7NDbNkGhu2BXgqaicPU6oe26zQPc5vtwWnHmiKlh1hYA==",
"dev": true, "dev": true,
"hasInstallScript": true, "hasInstallScript": true,
"dependencies": { "dependencies": {
@ -22404,9 +22404,9 @@
} }
}, },
"electron": { "electron": {
"version": "29.3.1", "version": "30.1.0",
"resolved": "https://repo.symphony.com/artifactory/api/npm/npm-virtual-dev/electron/-/electron-29.3.1.tgz", "resolved": "https://repo.symphony.com/artifactory/api/npm/npm-virtual-dev/electron/-/electron-30.1.0.tgz",
"integrity": "sha512-auge1/6RVqgUd6TgIq88wKdUCJi2cjESi3jy7d+6X4JzvBGprKBqMJ8JSSFpu/Px1YJrFUKAxfy6SC+TQf1uLw==", "integrity": "sha512-9O8m7kinjwMH5Df0hpXbwUaqI6pk3aJm1sKQUkQGCF7NDbNkGhu2BXgqaicPU6oe26zQPc5vtwWnHmiKlh1hYA==",
"dev": true, "dev": true,
"requires": { "requires": {
"@electron/get": "^2.0.0", "@electron/get": "^2.0.0",

2
package.json
View File

@ -178,7 +178,7 @@
"builder-util-runtime": "^9.0.3", "builder-util-runtime": "^9.0.3",
"cross-env": "7.0.3", "cross-env": "7.0.3",
"del": "3.0.0", "del": "3.0.0",
"electron": "30.0.9", "electron": "30.1.0",
"electron-builder": "^24.13.2", "electron-builder": "^24.13.2",
"electron-devtools-installer": "^3.2.0", "electron-devtools-installer": "^3.2.0",
"electron-icon-maker": "0.0.5", "electron-icon-maker": "0.0.5",

4
src/app/window-handler.ts
View File

@ -529,7 +529,7 @@ export class WindowHandler {
// Event needed to hide native menu bar on Windows 10 as we use custom menu bar // Event needed to hide native menu bar on Windows 10 as we use custom menu bar
this.mainWebContents.once('did-start-loading', () => { this.mainWebContents.once('did-start-loading', () => {
logger.info( logger.info(
`window-handler: main window web contents started loading for url ${this.mainView?.webContents.getURL()}!`, `window-handler: main window web contents started loading for url ${this.mainView?.webContents?.getURL()}!`,
); );
this.finishedLoading = false; this.finishedLoading = false;
this.listenForLoad(); this.listenForLoad();
@ -652,7 +652,7 @@ export class WindowHandler {
// workaround for https://perzoinc.atlassian.net/browse/SDA-4251 // workaround for https://perzoinc.atlassian.net/browse/SDA-4251
this.mainWindow?.on('focus', () => { this.mainWindow?.on('focus', () => {
const mainView = this.getMainView(); const mainView = this.getMainView();
mainView?.webContents.focus(); mainView?.webContents?.focus();
if ( if (
this.mainWindow && this.mainWindow &&
windowExists(this.mainWindow) && windowExists(this.mainWindow) &&