Close #646: Upgrade electron to 27.0.3 (#1035)

thamara · Nov 12, 2023 · 26066c4 · 26066c4
1 parent 26f5d4c
commit 26066c4
Show file tree

Hide file tree

Showing 7 changed files with 21,177 additions and 17,548 deletions.
diff --git a/__tests__/__main__/notification.js b/__tests__/__main__/notification.js
@@ -30,7 +30,8 @@ describe('Notifications', function()
             notification.on('show', (event) =>
             {
                 expect(event).toBeTruthy();
-                expect(event.sender.title).toBe('Time to Leave');
+                // In Electron 25 the definition of Event changed and we can no longer
+                // check information about the event sender
                 notification.close();
                 done();
             });
@@ -60,7 +61,8 @@ describe('Notifications', function()
             notification.on('show', (event) =>
             {
                 expect(event).toBeTruthy();
-                expect(event.sender.title).toBe('Time to Leave');
+                // In Electron 25 the definition of Event changed and we can no longer
+                // check information about the event sender
                 notification.close();
                 done();
             });

diff --git a/__tests__/__renderer__/window-aux.js b/__tests__/__renderer__/window-aux.js
@@ -2,8 +2,7 @@
 'use strict';
 
 const path = require('path');
-const { remote } = require('electron');
-const { BrowserWindow } = remote;
+const BrowserWindow = require('@electron/remote').BrowserWindow;
 import * as windowAux from '../../js/window-aux.js';
 
 describe('window-aux.js Testing', function()

diff --git a/js/user-preferences.js b/js/user-preferences.js
@@ -88,7 +88,7 @@ function getPreferencesFilePath()
 {
     const path = require('path');
     const electron = require('electron');
-    const userDataPath = (electron.app || electron.remote.app).getPath('userData');
+    const userDataPath = (electron.app || require('@electron/remote').app).getPath('userData');
     return path.join(userDataPath, 'preferences.json');
 }
 

diff --git a/js/window-aux.js b/js/window-aux.js
@@ -1,8 +1,8 @@
 'use strict';
 
 const electron = require('electron');
-const BrowserWindow = (electron || electron.remote).BrowserWindow;
-const dialog = (electron || electron.remote).dialog;
+const BrowserWindow = (electron || require('@electron/remote')).BrowserWindow;
+const dialog = (electron || require('@electron/remote')).dialog;
 
 /**
  * Opens an electron dialog, based on the options, and returns the promise.