Update to electron 13

Paxa · Aug 21, 2021 · deef0bb · deef0bb
1 parent 8db44d6
commit deef0bb
Show file tree

Hide file tree

Showing 6 changed files with 600 additions and 564 deletions.
diff --git a/app/views/history_window.js b/app/views/history_window.js
@@ -19,6 +19,7 @@ class HistoryWindow {
         allowRunningInsecureContent: true,
         nodeIntegration: true,
         enableRemoteModule: true,
+        contextIsolation: false,
       }
     });
 

diff --git a/app/views/snippets.js b/app/views/snippets.js
@@ -18,6 +18,7 @@ class SnippetsWindow {
         allowRunningInsecureContent: true,
         nodeIntegration: true,
         enableRemoteModule: true,
+        contextIsolation: false,
       }
     });
 

diff --git a/index.html b/index.html
@@ -18,7 +18,7 @@
           document.body.classList.add('unfocused');
         }
         document.body.classList.add("platform-" + process.platform);
-        if (electron.systemPreferences && electron.systemPreferences.isDarkMode()) {
+        if (electron.nativeTheme && electron.nativeTheme.shouldUseDarkColors) {
           document.body.classList.add("dark-mode");
         }
       })();

diff --git a/main.js b/main.js
@@ -17,7 +17,7 @@ var urlsToOpen = [];
 
 if (electron.systemPreferences && electron.systemPreferences.subscribeNotification) {
   var checkDarkMode = () => {
-    if (electron.systemPreferences.isDarkMode()) {
+    if (electron.nativeTheme.shouldUseDarkColors) {
       electron.systemPreferences.setAppLevelAppearance('dark');
     } else {
       electron.systemPreferences.setAppLevelAppearance('light');
@@ -70,6 +70,7 @@ app.on('ready', () => {
     webPreferences: {
       nodeIntegration: true,
       enableRemoteModule: true,
+      contextIsolation: false,
     },
   });
 

diff --git a/package.json b/package.json
@@ -27,7 +27,7 @@
     "@types/mousetrap": "^1.6.4",
     "@types/pg": "^7.14.5",
     "@types/semver": "~7.3.8",
-    "electron": "^10.4.0",
+    "electron": "^13.2.0",
     "electron-builder": "^22.11.7",
     "electron-mocha": "^9.2.0",
     "eslint": "^7.32.0",