7 files changed, 29 insertions, 40 deletions

diff --git a/README.md b/README.md
index 4a3162e0f..f63e1920c 100644
--- a/README.md
+++ b/README.md
@@ -227,7 +227,7 @@ If you use an AUR Helper, e.g. yay, install it via `yay -S ferdi`.
 
 ### Adds internal changes
 
-- [x] Upgrades to Electron 13.5.1
+- [x] Upgrades to Electron 14.1.0
 - [x] Switches to [`electron-spellchecker`](https://github.com/electron-userland/electron-spellchecker) to improve application size
 - [x] Minifies build files to improve app size
 - [x] Adds "npm run prepare-code" command for development to lint and beautify code
diff --git a/package-lock.json b/package-lock.json
index fe60108d8..a4bc73cec 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -13066,9 +13066,9 @@
       }
     },
     "electron": {
-      "version": "13.5.1",
-      "resolved": "https://registry.npmjs.org/electron/-/electron-13.5.1.tgz",
-      "integrity": "sha512-ZyxhIhmdaeE3xiIGObf0zqEyCyuIDqZQBv9NKX8w5FNzGm87j4qR0H1+GQg6vz+cA1Nnv1x175Zvimzc0/UwEQ==",
+      "version": "14.1.0",
+      "resolved": "https://registry.npmjs.org/electron/-/electron-14.1.0.tgz",
+      "integrity": "sha512-MnZSITjtdrY6jM/z/qXcuJqbIvz7MbxHp9f1O93mq/vt7aTxHYgjerPSqwya/RoUjkPEm1gkz669FsRk6ZtMdQ==",
       "dev": true,
       "requires": {
         "@electron/get": "^1.0.1",
@@ -13430,13 +13430,13 @@
       }
     },
     "electron-react-titlebar": {
-      "version": "0.8.2",
-      "resolved": "https://registry.npmjs.org/electron-react-titlebar/-/electron-react-titlebar-0.8.2.tgz",
-      "integrity": "sha512-Bbkaryi6JmtSuq8hAM+RNxlPhmQdE/7bdEsBasTtS+tbHHPsX0p4ilxVxKlFt23geV8kQaSq7qoZr30ixW8jtw==",
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/electron-react-titlebar/-/electron-react-titlebar-1.0.0.tgz",
+      "integrity": "sha512-/Ilv4kYPyJ1czijKtkQ1pXgvI/UeWaHjlNRnvuimWbrDzJJhsEtRHMdbnR1MaZEqRlT5pPlCIy3VflTP6ow3rg==",
       "requires": {
-        "classnames": "^2.2.6",
-        "lodash": "^4.17.15",
-        "react-virtualized": "^9.7.6"
+        "classnames": "^2.3.1",
+        "lodash": "^4.17.21",
+        "react-virtualized": "^9.22.3"
       }
     },
     "electron-to-chromium": {
@@ -25673,18 +25673,6 @@
         "loose-envify": "^1.4.0",
         "prop-types": "^15.7.2",
         "react-lifecycles-compat": "^3.0.4"
-      },
-      "dependencies": {
-        "prop-types": {
-          "version": "15.7.2",
-          "resolved": "https://registry.npmjs.org/prop-types/-/prop-types-15.7.2.tgz",
-          "integrity": "sha512-8QQikdH7//R2vurIJSutZ1smHYTcLpRWEOlHnzcWHmBYrOGUysKwSsrC89BCiFj3CbrfJ/nXFdJepOVrY1GCHQ==",
-          "requires": {
-            "loose-envify": "^1.4.0",
-            "object-assign": "^4.1.1",
-            "react-is": "^16.8.1"
-          }
-        }
       }
     },
     "reactive-localstorage": {
diff --git a/package.json b/package.json
index 7e817acce..97edff9d2 100644
--- a/package.json
+++ b/package.json
@@ -83,7 +83,7 @@
     "electron-dl": "3.2.1",
     "electron-fetch": "1.7.4",
     "electron-find": "1.0.7",
-    "electron-react-titlebar": "0.8.2",
+    "electron-react-titlebar": "1.0.0",
     "electron-updater": "4.3.9",
     "electron-window-state": "5.0.3",
     "fs-extra": "10.0.0",
@@ -171,7 +171,7 @@
     "cross-env": "7.0.3",
     "cz-conventional-changelog": "3.3.0",
     "dotenv": "10.0.0",
-    "electron": "13.5.1",
+    "electron": "14.1.0",
     "electron-builder": "22.12.1",
     "electron-notarize": "1.1.0",
     "eslint": "7.32.0",
diff --git a/src/components/auth/AuthLayout.js b/src/components/auth/AuthLayout.js
index 3e2b75731..17ac221a2 100644
--- a/src/components/auth/AuthLayout.js
+++ b/src/components/auth/AuthLayout.js
@@ -1,7 +1,7 @@
 import React, { Component } from 'react';
 import PropTypes from 'prop-types';
 import { observer } from 'mobx-react';
-import { TitleBar } from 'electron-react-titlebar';
+import { TitleBar } from 'electron-react-titlebar/renderer';
 
 import { injectIntl } from 'react-intl';
 import Link from '../ui/Link';
diff --git a/src/components/layout/AppLayout.js b/src/components/layout/AppLayout.js
index 9f8e217b9..0a65dcffa 100644
--- a/src/components/layout/AppLayout.js
+++ b/src/components/layout/AppLayout.js
@@ -2,7 +2,7 @@ import React, { Component } from 'react';
 import PropTypes from 'prop-types';
 import { observer, PropTypes as MobxPropTypes } from 'mobx-react';
 import { defineMessages, injectIntl } from 'react-intl';
-import { TitleBar } from 'electron-react-titlebar';
+import { TitleBar } from 'electron-react-titlebar/renderer';
 import injectSheet from 'react-jss';
 
 import InfoBar from '../ui/InfoBar';
diff --git a/src/components/services/content/ServiceWebview.js b/src/components/services/content/ServiceWebview.js
index c0f48793a..d3170be53 100644
--- a/src/components/services/content/ServiceWebview.js
+++ b/src/components/services/content/ServiceWebview.js
@@ -85,7 +85,8 @@ class ServiceWebview extends Component {
         useragent={service.userAgent}
         disablewebsecurity={service.recipe.disablewebsecurity ? true : undefined}
         allowpopups
-        webpreferences={`spellcheck=${isSpellcheckerEnabled ? 1 : 0}`}
+        nodeintegration
+        webpreferences={`spellcheck=${isSpellcheckerEnabled ? 1 : 0}, contextIsolation=1, enableRemoteModule=1`}
       />
     );
   }
diff --git a/src/index.js b/src/index.js
index d947d96ca..9f384f5fa 100644
--- a/src/index.js
+++ b/src/index.js
@@ -43,11 +43,6 @@ import userAgent from './helpers/userAgent-helpers';
 
 const debug = require('debug')('Ferdi:App');
 
-// From Electron 9 onwards, app.allowRendererProcessReuse = true by default. This causes the app to crash on Windows due to the
-// Electron Windows Notification API crashing. Setting this to false fixes the issue until the electron team fixes the notification bug
-// More Info - https://github.com/electron/electron/issues/18397
-app.allowRendererProcessReuse = false;
-
 // Globally set useragent to fix user agent override in service workers
 debug('Set userAgent to ', userAgent());
 app.userAgentFallback = userAgent();
@@ -411,31 +406,36 @@ app.on('ready', () => {
   }
 
   if (isWindows) {
-    app.setUserTasks([
-      {
-        program: process.execPath,
-        arguments: `${isDevMode ? `${__dirname} ` : ''}--reset-window`,
-        iconPath: asarPath(
+    const extraArgs = isDevMode ? `${__dirname} ` : '';
+    const iconPath = asarPath(
           join(
             isDevMode ? `${__dirname}../src/` : __dirname,
             'assets/images/taskbar/win32/display.ico',
           ),
-        ),
+        );
+    app.setUserTasks([
+      {
+        program: process.execPath,
+        arguments: `${extraArgs}--reset-window`,
+        iconPath,
         iconIndex: 0,
         title: 'Move Ferdi to Current Display',
         description: 'Restore the position and size of Ferdi',
       },
       {
         program: process.execPath,
-        arguments: `${isDevMode ? `${__dirname} ` : ''}--quit`,
+        arguments: `${extraArgs}--quit`,
+        iconPath,
         iconIndex: 0,
-        iconPath: null,
         title: 'Quit Ferdi',
         description: null,
       },
     ]);
   }
 
+  // eslint-disable-next-line global-require
+  require('electron-react-titlebar/main').initialize();
+
   createWindow();
 });