Merge branch 'dev' into Carter/macBuild

Author: Cartlong7

package-lock.json

@@ -118,7 +118,6 @@
     "css-loader": "^6.7.3",
     "depcheck": "^1.4.3",
     "dotenv": "^16.0.3",
-    "electron-devtools-vendor": "^1.2.0",
     "electron-reload": "^2.0.0-alpha.1",
     "electron-reloader": "^1.2.3",
     "electron-squirrel-startup": "^1.0.0",
@@ -168,7 +167,7 @@
     "@typescript-eslint/eslint-plugin": "^5.48.2",
     "@typescript-eslint/parser": "^5.48.2",
     "axe-core": "^4.6.2",
-    "electron": "^22.0.3",
+    "electron": "^24.3.0",
     "electron-builder": "^23.6.0",
     "electron-rebuild": "^3.2.9",
     "eslint": "^8.32.0",

package.json

@@ -6,7 +6,6 @@ const path = require('path');
 const fs = require('fs');
 const np = require('node-pty');
 const os = require('os');
-const { REACT_DEVELOPER_TOOLS } = require('electron-devtools-vendor');
 
 // app.commandLine.appendSwitch('--headless');
 // app.commandLine.appendSwitch('--no-sandbox');
@@ -275,18 +274,11 @@ ipcMain.on('Google-Oauth', (_event, url) => {
   });
 });
 
-// electron-devtools-vendor needs to be installed at v1.1 due to a bug with 1.2
-// where it is not accounting for a change in the newest version of the react dev tool itself
 app.whenReady()
   .then(createWindow)
   .then(app.on('activate', () => {
     if (BrowserWindow.getAllWindows().length === 0) createWindow()
   }))
-  .then(() => {
-    session.defaultSession.loadExtension(REACT_DEVELOPER_TOOLS, { allowFileAccess: true })
-      .then((name) => console.log(`Added Extension: ${name}`))
-      .catch((err) => console.log(`An error occurred adding an extension: ${err}`));
-  })
   .catch((err) => console.log(`An error occurred when booting up electron: ${err}`));