diff --git a/app/background.js b/app/background.js index 2c514dd5..94980327 100644 --- a/app/background.js +++ b/app/background.js @@ -34,7 +34,8 @@ 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', () => { @@ -42,13 +43,13 @@ app.on('ready', () => { 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') { diff --git a/app/package-lock.json b/app/package-lock.json index e8097090..46a65a20 100644 --- a/app/package-lock.json +++ b/app/package-lock.json @@ -8,7 +8,7 @@ "name": "pat", "version": "3.4.0", "dependencies": { - "@electron/remote": "~1.2.2", + "@electron/remote": "~2.0.8", "adm-zip": "~0.4.7", "angular": "~1.5.5", "archiver": "~4.0.1", @@ -44,11 +44,11 @@ } }, "node_modules/@electron/remote": { - "version": "1.2.2", - "resolved": "https://registry.npmjs.org/@electron/remote/-/remote-1.2.2.tgz", - "integrity": "sha512-PfnXpQGWh4vpX866NNucJRnNOzDRZcsLcLaT32fUth9k0hccsohfxprqEDYLzRg+ZK2xRrtyUN5wYYoHimMCJg==", + "version": "2.0.8", + "resolved": "https://registry.npmjs.org/@electron/remote/-/remote-2.0.8.tgz", + "integrity": "sha512-P10v3+iFCIvEPeYzTWWGwwHmqWnjoh8RYnbtZAb3RlQefy4guagzIwcWtfftABIfm6JJTNQf4WPSKWZOpLmHXw==", "peerDependencies": { - "electron": ">= 10.0.0-beta.1" + "electron": ">= 13.0.0" } }, "node_modules/@sindresorhus/is": { @@ -1469,9 +1469,9 @@ } }, "@electron/remote": { - "version": "1.2.2", - "resolved": "https://registry.npmjs.org/@electron/remote/-/remote-1.2.2.tgz", - "integrity": "sha512-PfnXpQGWh4vpX866NNucJRnNOzDRZcsLcLaT32fUth9k0hccsohfxprqEDYLzRg+ZK2xRrtyUN5wYYoHimMCJg==", + "version": "2.0.8", + "resolved": "https://registry.npmjs.org/@electron/remote/-/remote-2.0.8.tgz", + "integrity": "sha512-P10v3+iFCIvEPeYzTWWGwwHmqWnjoh8RYnbtZAb3RlQefy4guagzIwcWtfftABIfm6JJTNQf4WPSKWZOpLmHXw==", "requires": {} }, "@sindresorhus/is": { diff --git a/app/package.json b/app/package.json index 32930218..a371cdf7 100644 --- a/app/package.json +++ b/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", diff --git a/package-lock.json b/package-lock.json index a204564f..8358fef2 100644 --- a/package-lock.json +++ b/package-lock.json @@ -18,7 +18,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", @@ -3932,9 +3932,9 @@ "dev": true }, "node_modules/electron": { - "version": "12.2.3", - "resolved": "https://registry.npmjs.org/electron/-/electron-12.2.3.tgz", - "integrity": "sha512-B27c7eqx1bC5kea6An8oVhk1pShNC4VGqWarHMhD47MDtmg54KepHO5AbAvmKKZK/jWN7NTC7wyCYTDElJNtQA==", + "version": "14.2.9", + "resolved": "https://registry.npmjs.org/electron/-/electron-14.2.9.tgz", + "integrity": "sha512-7LdJFmqVzO9NLKO0hwOwPA6Kv4GSybGMcej8f2q7fVT4O8mIfL9oo/v4axVjVWm0+58ROQtHv8hYnnAs3ygG0Q==", "dev": true, "hasInstallScript": true, "dependencies": { @@ -18919,9 +18919,9 @@ "dev": true }, "electron": { - "version": "12.2.3", - "resolved": "https://registry.npmjs.org/electron/-/electron-12.2.3.tgz", - "integrity": "sha512-B27c7eqx1bC5kea6An8oVhk1pShNC4VGqWarHMhD47MDtmg54KepHO5AbAvmKKZK/jWN7NTC7wyCYTDElJNtQA==", + "version": "14.2.9", + "resolved": "https://registry.npmjs.org/electron/-/electron-14.2.9.tgz", + "integrity": "sha512-7LdJFmqVzO9NLKO0hwOwPA6Kv4GSybGMcej8f2q7fVT4O8mIfL9oo/v4axVjVWm0+58ROQtHv8hYnnAs3ygG0Q==", "dev": true, "requires": { "@electron/get": "^1.0.1", diff --git a/package.json b/package.json index 8a54c3f7..a7c4b7a9 100644 --- a/package.json +++ b/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", diff --git a/tasks/start.js b/tasks/start.js index c8e34dea..48cd7ff2 100644 --- a/tasks/start.js +++ b/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();