merge: Add in changes for Electron updates

Author: Parkreiner

main.js

@@ -1,21 +1,21 @@
 // https://github.com/electron/electron/issues/10257
 // Code fix to support NODE_EXTRA_CA_CERTS env. There is currently no other fixes to the NODE_TLS_REJECT_UNAUTHORIZED at the moment.
 
-(function(){
-	if(!process.env.NODE_EXTRA_CA_CERTS) return;
-	try{
-		const extraca = require("fs").readFileSync(process.env.NODE_EXTRA_CA_CERTS);
-	}catch(e){
-		return;
-	}
-
-	const NativeSecureContext = process.binding('crypto').SecureContext;
-	const oldaddRootCerts = NativeSecureContext.prototype.addRootCerts;
-	NativeSecureContext.prototype.addRootCerts = function(){
-		const ret = oldaddRootCerts.apply(this, ...args);
-		this.addCACert(extraca);
-		return ret;
-	};
+(function () {
+  if (!process.env.NODE_EXTRA_CA_CERTS) return;
+  try {
+    const extraca = require('fs').readFileSync(process.env.NODE_EXTRA_CA_CERTS);
+  } catch (e) {
+    return;
+  }
+
+  const NativeSecureContext = process.binding('crypto').SecureContext;
+  const oldaddRootCerts = NativeSecureContext.prototype.addRootCerts;
+  NativeSecureContext.prototype.addRootCerts = function () {
+    const ret = oldaddRootCerts.apply(this, ...args);
+    this.addCACert(extraca);
+    return ret;
+  };
 })();
 
 // Allow self-signing HTTPS over TLS
@@ -85,7 +85,6 @@ if (process.argv.includes('--dev')) {
   isDev = true;
 }
 
-
 /** ***********************
  ******* MODE DISPLAY ****
  ************************ */
@@ -144,7 +143,7 @@ function createWindow() {
     });
 
     // Dev mode title
-    mainWindow.setTitle("Swell (devMode)")
+    mainWindow.setTitle('Swell (devMode)');
 
     // If we are in developer mode Add React & Redux DevTools to Electron App
     installExtension(REACT_DEVELOPER_TOOLS)
@@ -161,7 +160,6 @@ function createWindow() {
       pathname: path.join(__dirname, 'dist', 'index.html'),
       slashes: true,
     });
-
   }
 
   // our new app window will load content depending on the boolean value of the dev variable
@@ -226,10 +224,9 @@ const sendStatusToWindow = (text) => {
 };
 
 ipcMain.on('login-via-github', async () => {
-  const url = `http://github.com/login/oauth/authorize?scope=repo&redirect_uri=http://localhost:3000/signup/github/callback/&client_id=6e9d37a09ab8bda68d50` // ${process.env.GITHUB_CLIENT_ID};
+  const url = `http://github.com/login/oauth/authorize?scope=repo&redirect_uri=http://localhost:3000/signup/github/callback/&client_id=6e9d37a09ab8bda68d50`; // ${process.env.GITHUB_CLIENT_ID};
   await shell.openExternal(url, { activate: true });
-
-})
+});
 
 ipcMain.on('check-for-update', () => {
   // listens to ipcRenderer in UpdatePopUpContainer.jsx
@@ -324,8 +321,8 @@ ipcMain.on('import-from-github', async (event, args) => {
   // requiring typescript type Workspace makes sanitation uncessesary
   const ids = {};
   let index = 0;
-  const newCollectionArr = []
-  for(let collection of args) {
+  const newCollectionArr = [];
+  for (let collection of args) {
     // console.log('main.js workspace\n', workspace)
     if (ids[collection.id]) {
       const result = await popOverwrite(collection);
@@ -336,9 +333,8 @@ ipcMain.on('import-from-github', async (event, args) => {
     }
     ids[collection.id] = index;
     index++;
-    newCollectionArr.push(collection)
-
-  };
+    newCollectionArr.push(collection);
+  }
   // send full array of workspaces to chromium for state update
   event.sender.send('add-collections', newCollectionArr);
 });

package.json

@@ -217,7 +217,7 @@
     "cross-env": "^7.0.3",
     "csp-html-webpack-plugin": "^5.1.0",
     "css-loader": "^6.7.1",
-    "electron": "^18.1.0",
+    "electron": "^18.3.5",
     "electron-builder": "^23.0.3",
     "electron-react-devtools": "^0.5.3",
     "eslint": "^8.14.0",