feat(electron): support for v7 (#172)

closes #162
nstudio · Jan 5, 2020 · e328f7a · e328f7a
1 parent 41a8c8e
commit e328f7a
Show file tree

Hide file tree

Showing 4 changed files with 70 additions and 23 deletions.
diff --git a/packages/electron-angular/src/schematics/application/_files/src/index.ts__tmpl__ b/packages/electron-angular/src/schematics/application/_files/src/index.ts__tmpl__
@@ -24,8 +24,11 @@ const mainWindowSettings: Electron.BrowserWindowConstructorOptions = {
   focusable: true,
   fullscreenable: true,
   kiosk: false,
+  // to hide title bar, uncomment:
+  // titleBarStyle: 'hidden',
   webPreferences: {
-    devTools: debugMode
+    devTools: debugMode,
+    nodeIntegration: debugMode
   }
 };
 
@@ -48,7 +51,7 @@ function createWindow() {
   const sizes = screen.getPrimaryDisplay().workAreaSize;
 
   if (debugMode) {
-    process.env['ELECTRON_DISABLE_SECURITY_WARNINGS'] = 'true';
+    process.env.ELECTRON_DISABLE_SECURITY_WARNINGS = 'true';
 
     mainWindowSettings.width = 800;
     mainWindowSettings.height = 600;
@@ -98,10 +101,20 @@ function createWindow() {
 try {
   app.on('ready', createWindow);
 
-  app.on('window-all-closed', () => {
-    if (process.platform !== 'darwin') {
-      app.quit();
-    }
+  app.on('window-all-closed', quit);
+
+  ipcMain.on('quit', quit);
+
+  ipcMain.on('minimize', () => {
+    win.minimize();
+  });
+
+  ipcMain.on('maximize', () => {
+    win.maximize();
+  });
+
+  ipcMain.on('restore', () => {
+    win.restore();
   });
 
   app.on('activate', () => {
@@ -112,3 +125,9 @@ try {
     }
   });
 } catch (err) {}
+
+function quit() {
+  if (process.platform !== 'darwin') {
+    app.quit();
+  }
+}
diff --git a/...es/electron-angular/src/schematics/xplat/_files/core/services/electron.service.ts__tmpl__ b/...es/electron-angular/src/schematics/xplat/_files/core/services/electron.service.ts__tmpl__
@@ -3,10 +3,11 @@ import { LogService, WindowService } from '@<%= npmScope %>/core';
 import { isElectron } from '@<%= npmScope %>/utils';
 import * as childProcess from 'child_process';
 import { ipcRenderer } from 'electron';
+import IpcRendererEvent = Electron.IpcRendererEvent;
 
 @Injectable()
 export class ElectronService {
-  private _ipc: typeof ipcRenderer;
+  private readonly _ipc: typeof ipcRenderer;
   private _childProcess: typeof childProcess;
 
   constructor(private _log: LogService, private _win: WindowService) {
@@ -18,19 +19,27 @@ export class ElectronService {
     }
   }
 
-  public on(channel: string, listener: Function): void {
+  on(channel: string, listener: (event: IpcRendererEvent, ...args: any[]) => void): void {
     if (!this._ipc) {
       return;
     }
 
     this._ipc.on(channel, listener);
   }
 
-  public send(channel: string, ...args): void {
+  send(channel: string, ...args): void {
     if (!this._ipc) {
       return;
     }
 
     this._ipc.send(channel, ...args);
   }
+
+  sendSync(channel: string, ...args): void {
+    if (!this._ipc) {
+      return;
+    }
+
+    this._ipc.sendSync(channel, ...args);
+  }
 }
diff --git a/packages/electron/src/schematics/application/_files/src/index.ts__tmpl__ b/packages/electron/src/schematics/application/_files/src/index.ts__tmpl__
@@ -24,8 +24,11 @@ const mainWindowSettings: Electron.BrowserWindowConstructorOptions = {
   focusable: true,
   fullscreenable: true,
   kiosk: false,
+  // to hide title bar, uncomment:
+  // titleBarStyle: 'hidden',
   webPreferences: {
-    devTools: debugMode
+    devTools: debugMode,
+    nodeIntegration: debugMode
   }
 };
 
@@ -48,7 +51,7 @@ function createWindow() {
   const sizes = screen.getPrimaryDisplay().workAreaSize;
 
   if (debugMode) {
-    process.env['ELECTRON_DISABLE_SECURITY_WARNINGS'] = 'true';
+    process.env.ELECTRON_DISABLE_SECURITY_WARNINGS = 'true';
 
     mainWindowSettings.width = 800;
     mainWindowSettings.height = 600;
@@ -98,10 +101,20 @@ function createWindow() {
 try {
   app.on('ready', createWindow);
 
-  app.on('window-all-closed', () => {
-    if (process.platform !== 'darwin') {
-      app.quit();
-    }
+  app.on('window-all-closed', quit);
+
+  ipcMain.on('quit', quit);
+
+  ipcMain.on('minimize', () => {
+    win.minimize();
+  });
+
+  ipcMain.on('maximize', () => {
+    win.maximize();
+  });
+
+  ipcMain.on('restore', () => {
+    win.restore();
   });
 
   app.on('activate', () => {
@@ -112,3 +125,9 @@ try {
     }
   });
 } catch (err) {}
+
+function quit() {
+  if (process.platform !== 'darwin') {
+    app.quit();
+  }
+}
diff --git a/packages/electron/src/utils/versions.ts b/packages/electron/src/utils/versions.ts
@@ -1,11 +1,11 @@
 export const xplatVersion = '*';
-export const electronVersion = '^4.0.5';
-export const electronBuilderVersion = '^20.38.4';
-export const electronRebuildVersion = '~1.8.4';
+export const electronVersion = '^7.0.1';
+export const electronBuilderVersion = '^20.44.4';
+export const electronRebuildVersion = '~1.8.6';
 export const electronInstallerDmgVersion = '~3.0.0';
-export const electronPackagerVersion = '~13.1.0';
-export const electronReloadVersion = '~1.4.0';
-export const electronStoreVersion = '~2.0.0';
-export const electronUpdaterVersion = '~4.0.6';
+export const electronPackagerVersion = '~14.1.0';
+export const electronReloadVersion = '~1.5.0';
+export const electronStoreVersion = '~5.1.0';
+export const electronUpdaterVersion = '~4.2.0';
 export const npmRunAllVersion = '^4.1.5';
-export const waitOnVersion = '~3.2.0';
+export const waitOnVersion = '~3.3.0';