enable Quasar development mode for Electron

BUG: ZAPP-544

src-electron/main-process/electron-main.dev.js

@@ -42,5 +42,10 @@ require('electron')
       })
   })
 
+// Development via Electron.
+if (process.env.MODE === 'electron') {
+  process.argv.push('--allowCors')
+}
+
 // Require `main` process to boot app
 require('./electron-main.js')

src-electron/main-process/startup.js

@@ -99,16 +99,22 @@ async function startNormal(
       else return ctx
     })
     .then((ctx) => {
+      let port = httpServer.httpServerPort()
+
+      if (process.env.DEV && process.env.MODE === 'electron') {
+        port = 8080
+      }
+
       if (uiEnabled) {
-        windowJs.initializeElectronUi(httpServer.httpServerPort())
+        windowJs.initializeElectronUi(port)
         if (zapFiles.length == 0) {
-          return uiJs.openNewConfiguration(httpServer.httpServerPort(), {
+          return uiJs.openNewConfiguration(port, {
             uiMode: argv.uiMode,
             embeddedMode: argv.embeddedMode,
           })
         } else {
           return util.executePromisesSequentially(zapFiles, (f) =>
-            uiJs.openFileConfiguration(f, httpServer.httpServerPort())
+            uiJs.openFileConfiguration(f, port)
           )
         }
       } else {

src-electron/ui/window.js

@@ -22,6 +22,8 @@ const querySession = require('../db/query-session.js')
 const menu = require('./menu.js')
 const tray = require('./tray.js')
 const browserApi = require('./browser-api.js')
+const querystringUtil = require('querystring')
+const httpServer = require('../server/http-server.js')
 
 let windowCounter = 0
 
@@ -46,16 +48,18 @@ function windowCreateIfNotThere(port) {
   }
 }
 
-function createQueryString(uiMode = null) {
-  let queryString = ''
+function createQueryString(uiMode = null, restPort) {
+  let params = {}
   if (uiMode) {
-    if (queryString.length == 0) {
-      queryString = `?uiMode=${uiMode}`
-    } else {
-      queryString += `&uiMode=${uiMode}`
-    }
+    params.uiMode = uiMode
   }
-  return queryString
+
+  // Electron/Development mode
+  if (process.env.DEV && process.env.MODE === 'electron' && restPort) {
+    params.restPort = restPort
+  }
+
+  return '?' + querystringUtil.stringify(params)
 }
 
 /**
@@ -86,7 +90,7 @@ function windowCreate(port, args = {}) {
     webPreferences: webPreferences,
   })
 
-  let queryString = createQueryString(args.uiMode)
+  let queryString = createQueryString(args.uiMode, httpServer.httpServerPort())
 
   w.isDirty = false
   w.loadURL(`http://localhost:${port}/` + queryString).then(async () => {