refactor: remove 'electron-util' and 'electron-is-dev' as dependencies (#2008)

(pre-requisite for electron v14)

6 files changed, 80 insertions, 23 deletions

diff --git a/package-lock.json b/package-lock.json
index 90b90d423..b6166ff22 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -13267,11 +13267,6 @@
       "resolved": "https://registry.npmjs.org/electron-find/-/electron-find-1.0.7.tgz",
       "integrity": "sha512-C2FQJuk8567P2a2loBNwl5c8kwOTQVMB0capgHtPI7zKwZG16X0UxG+sNYZExQfnJ0PA+ecECA/4LcXxQa2TCA=="
     },
-    "electron-is-dev": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/electron-is-dev/-/electron-is-dev-1.2.0.tgz",
-      "integrity": "sha512-R1oD5gMBPS7PVU8gJwH6CtT0e6VSoD0+SzSnYpNm+dBkcijgA+K7VAMHDfnRq/lkKPZArpzplTW6jfiMYosdzw=="
-    },
     "electron-notarize": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/electron-notarize/-/electron-notarize-1.1.0.tgz",
@@ -13465,15 +13460,6 @@
         "semver": "^7.3.5"
       }
     },
-    "electron-util": {
-      "version": "0.17.2",
-      "resolved": "https://registry.npmjs.org/electron-util/-/electron-util-0.17.2.tgz",
-      "integrity": "sha512-4Kg/aZxJ2BZklgyfH86px/D2GyROPyIcnAZar+7KiNmKI2I5l09pwQTP7V95zM3FVhgDQwV9iuJta5dyEvuWAw==",
-      "requires": {
-        "electron-is-dev": "^1.1.0",
-        "new-github-issue-url": "^0.2.1"
-      }
-    },
     "electron-window-state": {
       "version": "5.0.3",
       "resolved": "https://registry.npmjs.org/electron-window-state/-/electron-window-state-5.0.3.tgz",
@@ -22628,11 +22614,6 @@
       "integrity": "sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==",
       "dev": true
     },
-    "new-github-issue-url": {
-      "version": "0.2.1",
-      "resolved": "https://registry.npmjs.org/new-github-issue-url/-/new-github-issue-url-0.2.1.tgz",
-      "integrity": "sha512-md4cGoxuT4T4d/HDOXbrUHkTKrp/vp+m3aOA7XXVYwNsUNMK49g3SQicTSeV5GIz/5QVGAeYRAOlyp9OvlgsYA=="
-    },
     "next-tick": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/next-tick/-/next-tick-1.0.0.tgz",
diff --git a/package.json b/package.json
index 5484fd173..73cf13310 100644
--- a/package.json
+++ b/package.json
@@ -85,7 +85,6 @@
     "electron-find": "1.0.7",
     "electron-react-titlebar": "0.8.2",
     "electron-updater": "4.3.9",
-    "electron-util": "0.17.2",
     "electron-window-state": "5.0.3",
     "fs-extra": "10.0.0",
     "jsonwebtoken": "8.5.1",
diff --git a/src/electron-util.ts b/src/electron-util.ts
new file mode 100644
index 000000000..f4b26cb10
--- /dev/null
+++ b/src/electron-util.ts
@@ -0,0 +1,30 @@
+// Enhanced from: https://github.com/dertieran/electron-util/blob/replace-remote/source/api.js
+
+import electron from 'electron';
+import { initialize } from '@electron/remote/main';
+
+export const initializeRemote = () => {
+  if (process.type !== 'browser') {
+    throw new Error('The remote api must be initialized from the main process.');
+  }
+
+  initialize();
+};
+
+export const remote = new Proxy({}, {
+  get: (_target, property) => {
+    // eslint-disable-next-line global-require
+    const remote = require('@electron/remote');
+    return remote[property];
+  },
+});
+
+export const api = new Proxy(electron, {
+  get: (target, property) => {
+    if (target[property]) {
+      return target[property];
+    }
+
+    return remote[property];
+  },
+});
diff --git a/src/enforce-macos-app-location.ts b/src/enforce-macos-app-location.ts
new file mode 100644
index 000000000..0f858013d
--- /dev/null
+++ b/src/enforce-macos-app-location.ts
@@ -0,0 +1,46 @@
+// Enhanced from: https://github.com/dertieran/electron-util/blob/replace-remote/source/enforce-macos-app-location.js
+
+import { isMac } from './environment';
+import { isDevMode } from './environment-remote';
+import { api } from './electron-util';
+
+export function enforceMacOSAppLocation() {
+  if (isDevMode || !isMac || api.app.isInApplicationsFolder()) {
+    return;
+  }
+
+  const clickedButtonIndex = api.dialog.showMessageBoxSync({
+    type: 'error',
+    message: 'Move to Applications folder?',
+    detail: 'Ferdi must live in the Applications folder to be able to run correctly.',
+    buttons: [
+      'Move to Applications folder',
+      'Quit Ferdi',
+    ],
+    defaultId: 0,
+    cancelId: 1,
+  });
+
+  if (clickedButtonIndex === 1) {
+    api.app.quit();
+    return;
+  }
+
+  api.app.moveToApplicationsFolder({
+    conflictHandler: conflict => {
+      if (conflict === 'existsAndRunning') { // Can't replace the active version of the app
+        api.dialog.showMessageBoxSync({
+          type: 'error',
+          message: 'Another version of Ferdi is currently running. Quit it, then launch this version of the app again.',
+          buttons: [
+            'OK',
+          ],
+        });
+
+        api.app.quit();
+      }
+
+      return true;
+    },
+  });
+}
diff --git a/src/environment-remote.ts b/src/environment-remote.ts
index 1ff019c5f..89926a428 100644
--- a/src/environment-remote.ts
+++ b/src/environment-remote.ts
@@ -1,6 +1,6 @@
 import { join } from 'path';
 import osName from 'os-name';
-import { api as electronApi } from 'electron-util';
+import { api as electronApi } from './electron-util';
 import {
   LIVE_FERDI_API,
   DEV_FRANZ_API,
diff --git a/src/index.js b/src/index.js
index ed37134c9..87f45e7fc 100644
--- a/src/index.js
+++ b/src/index.js
@@ -5,10 +5,11 @@ import { app, BrowserWindow, ipcMain, session, dialog } from 'electron';
 import { emptyDirSync, ensureFileSync } from 'fs-extra';
 import { join } from 'path';
 import windowStateKeeper from 'electron-window-state';
-import { enforceMacOSAppLocation } from 'electron-util';
 import ms from 'ms';
+import { initializeRemote } from './electron-util';
+import { enforceMacOSAppLocation } from './enforce-macos-app-location';
 
-require('@electron/remote/main').initialize();
+initializeRemote();
 
 import { DEFAULT_APP_SETTINGS, DEFAULT_WINDOW_OPTIONS } from './config';