chore(electron): Move off deprecated remote module

jest.config.js

@@ -0,0 +1,19 @@
+const config = {
+  "preset": "ts-jest/presets/js-with-ts",
+  "setupFiles": [
+    "<rootDir>/src/__helpers__/setupEnvVars.js"
+  ],
+  "testEnvironment": "jsdom",
+  "coverageThreshold": {
+    "global": {
+      "lines": 90
+    }
+  },
+  "moduleNameMapper": {
+    // Force CommonJS build for http adapter to be available.
+    // via https://github.com/axios/axios/issues/5101#issuecomment-1276572468
+    '^axios$': require.resolve('axios'),
+  },
+}
+
+module.exports = config;

main.js

@@ -4,6 +4,8 @@ const { autoUpdater } = require('electron-updater');
 const { onFirstRunMaybe } = require('./first-run');
 const path = require('path');
 
+require('@electron/remote/main').initialize()
+
 app.setAppUserModelId('com.electron.gitify');
 
 const iconIdle = path.join(
@@ -75,6 +77,13 @@ menubarApp.on('ready', () => {
       }
     }
   });
+  ipcMain.handle('get-platform', async () => {
+    return process.platform;
+  });
+
+  ipcMain.handle('get-app-version', async () => {
+    return app.getVersion();
+  });
 
   menubarApp.window.webContents.on('devtools-opened', () => {
     menubarApp.window.setSize(800, 600);

package.json

@@ -48,18 +48,6 @@
     "url": "https://github.com/manosim/gitify/issues"
   },
   "homepage": "https://www.gitify.io/",
-  "jest": {
-    "preset": "ts-jest/presets/js-with-ts",
-    "setupFiles": [
-      "<rootDir>/src/__helpers__/setupEnvVars.js"
-    ],
-    "testEnvironment": "jsdom",
-    "coverageThreshold": {
-      "global": {
-        "lines": 90
-      }
-    }
-  },
   "build": {
     "appId": "com.electron.gitify",
     "productName": "Gitify",
@@ -105,8 +93,9 @@
     "afterSign": "scripts/notarize.js"
   },
   "dependencies": {
+    "@electron/remote": "^2.0.11",
     "@primer/octicons-react": "19.8.0",
-    "axios": "0.27.2",
+    "axios": "1.5.1",
     "date-fns": "2.30.0",
     "electron-updater": "6.1.4",
     "final-form": "4.20.10",

src/__mocks__/@electron/remote.js

@@ -0,0 +1,38 @@
+let instance;
+
+class BrowserWindow {
+  constructor() {
+    if (!instance) {
+      instance = this;
+    }
+    return instance;
+  }
+  loadURL = jest.fn();
+  webContents = {
+    on: () => {},
+    session: {
+      clearStorageData: jest.fn(),
+    },
+  };
+  on() {}
+  close = jest.fn();
+  hide = jest.fn();
+  destroy = jest.fn();
+}
+
+const dialog = {
+  showErrorBox: jest.fn(),
+};
+
+module.exports = {
+  BrowserWindow: BrowserWindow,
+  dialog: dialog,
+  process: {
+    platform: 'darwin',
+  },
+  app: {
+    getLoginItemSettings: jest.fn(),
+    setLoginItemSettings: () => {},
+  },
+  getCurrentWindow: jest.fn(() => instance || new BrowserWindow()),
+};

src/__mocks__/electron.js

@@ -27,49 +27,21 @@ window.localStorage = {
 
 window.alert = jest.fn();
 
-let instance;
-
-class BrowserWindow {
-  constructor() {
-    if (!instance) {
-      instance = this;
-    }
-    return instance;
-  }
-  loadURL = jest.fn();
-  webContents = {
-    on: () => {},
-    session: {
-      clearStorageData: jest.fn(),
-    },
-  };
-  on() {}
-  close = jest.fn();
-  hide = jest.fn();
-  destroy = jest.fn();
-}
-
-const dialog = {
-  showErrorBox: jest.fn(),
-};
-
 module.exports = {
-  remote: {
-    BrowserWindow: BrowserWindow,
-    dialog: dialog,
-    process: {
-      platform: 'darwin',
-    },
-    app: {
-      getVersion: () => '0.0.1',
-      getLoginItemSettings: jest.fn(),
-      setLoginItemSettings: () => {},
-    },
-    getCurrentWindow: jest.fn(() => instance || new BrowserWindow()),
-  },
   ipcRenderer: {
     send: jest.fn(),
     on: jest.fn(),
+    sendSync: jest.fn(),
+    invoke: jest.fn((channel, ...args) => {
+      switch (channel) {
+        case 'get-platform':
+          return Promise.resolve('darwin');
+        case 'get-app-version':
+          return Promise.resolve('0.0.1');
+        default:
+          return Promise.reject(new Error(`Unknown channel: ${channel}`));
+      }
+    }),
   },
   shell: {
     openExternal: jest.fn(),

src/hooks/useNotifications.test.ts

@@ -9,7 +9,9 @@ import { mockedUser } from '../__mocks__/mockedData';
 
 describe('hooks/useNotifications.ts', () => {
   beforeEach(() => {
-    axios.defaults.adapter = require('axios/lib/adapters/http');
+    // axios will default to using the XHR adapter which can't be intercepted
+    // by nock. So, configure axios to use the node adapter.
+    axios.defaults.adapter = 'http';
   });
 
   describe('fetchNotifications', () => {