#219: Upgrade electron to v14, migrate @electron/remote to v2, and mo…

…dify gulp start task so server is ready before electron build command runs

app/background.js

@@ -34,21 +34,22 @@ import { app } from 'electron';
 import createWindow from './electron/window';
 import { getEnv } from './env';
 
-require('@electron/remote/main').initialize();
+const remoteMain = require('@electron/remote/main');
+remoteMain.initialize();
 
 app.on('ready', () => {
 
   const mainWindow = createWindow('main', {
     width: 1000,
     height: 600,
     webPreferences: {
-      enableRemoteModule: true,
       nodeIntegration: true,
       contextIsolation: false,
       webviewTag: true,
       webSecurity: false // Disable the same-origin policy when using http
     }
   });
+  remoteMain.enable(mainWindow.webContents);
 
   const env = getEnv(app.getAppPath());
   if (env.name === 'test') {

app/package.json

@@ -7,7 +7,7 @@
   "author": "National Renewable Energy Laboratory",
   "main": "background.js",
   "dependencies": {
-    "@electron/remote": "~1.2.2",
+    "@electron/remote": "~2.0.8",
     "adm-zip": "~0.4.7",
     "angular": "~1.5.5",
     "archiver": "~4.0.1",

package.json

@@ -11,7 +11,7 @@
     "browser-sync-spa": "~1.0.3",
     "chalk": "~1.1.1",
     "del": "~2.2.0",
-    "electron": "~12.2.3",
+    "electron": "~14.2.9",
     "eslint-plugin-angular": "~1.0.0",
     "eslint-plugin-lodash": "~1.5.1",
     "estraverse": "~4.2.0",

tasks/start.js

@@ -16,7 +16,7 @@ var browserSync = require('browser-sync').create();
 var browserSyncSpa = require('browser-sync-spa');
 
 browserSync.use(browserSyncSpa({selector: '[ng-app]'}));
-function browserSyncInit(baseDir) {
+function browserSyncInit(baseDir, callback) {
 
   var routes = null;
   if (baseDir === conf.paths.src || (util.isArray(baseDir) && baseDir.indexOf(conf.paths.src) !== -1)) {
@@ -45,7 +45,7 @@ function browserSyncInit(baseDir) {
       awaitWriteFinish: true,
       ignoreInitial: true
     }
-  });
+  }, callback);
 }
 
 var gulpPath = path.resolve('./node_modules/.bin/gulp');
@@ -87,8 +87,7 @@ var runGulpWatch = function () {
   });
 };
 
-var runApp = function () {
-  if (env == 'development') browserSyncInit([path.join(conf.paths.tmp, '/serve'), conf.paths.src]);
+var runElectronApp = function () {
   var app = childProcess.spawn(electron, ['./build'], {
     stdio: 'inherit'
   });
@@ -101,6 +100,12 @@ var runApp = function () {
   });
 };
 
+var runApp = function () {
+  env == 'development'
+    ? browserSyncInit([path.join(conf.paths.tmp, '/serve'), conf.paths.src], runElectronApp)
+    : runElectronApp();
+};
+
 runBuild().then(function () {
   runGulpWatch();
   runApp();