ref(builders/electron): installAppDeps via runModuleAsObservableFork

Author: Heiko Does

packages/builders/package-lock.json

@@ -1,7 +1,7 @@
 {
   "name": "@ng-electron-devkit/builders",
   "description": "Development, test and build  tools for angular applications running in electron",
-  "version": "7.0.0-alpha5",
+  "version": "7.0.0-alpha7",
   "builders": "builders.json",
   "scripts": {
     "build": "../../node_modules/.bin/tsc",
@@ -21,7 +21,8 @@
     "@types/rimraf": "^2.0.2",
     "glob": "^7.1.3",
     "rimraf": "^2.6.3",
-    "tree-kill": "^1.2.1"
+    "tree-kill": "^1.2.1",
+    "yargs": "13.3.0"
   },
   "author": "Provinzial Rheinland Versicherung AG",
   "license": "MPL-2.0",

packages/builders/package.json

@@ -1,6 +1,8 @@
 import {BuildElectronArgs} from "./build-electron-args";
+import * as yargs from 'yargs';
 
 let builder = require('electron-builder');
+let installAppDeps = require('electron-builder/out/cli/install-app-deps.js');
 
 module.exports.build = function (args: BuildElectronArgs) {
 
@@ -21,3 +23,14 @@ module.exports.build = function (args: BuildElectronArgs) {
         process.exit(1)
     })
 };
+
+module.exports.installAppDeps = function (args: any) {
+    installAppDeps.installAppDeps(installAppDeps.configureInstallAppDepsCommand(yargs).argv).then(()=>{
+        console.log('electron-builder installAppDeps completed successful.');
+        process.exit(0)
+    }).catch((error: any) => {
+        console.error(`error invoking electron-builer installAppDeps: ${error}`);
+        process.exit(1)
+    })
+};
+

packages/builders/src/electron/build-electron.ts

@@ -75,53 +75,14 @@ export class ElectronBuilder extends BrowserBuilder {
         );
     }
 
-    installElectronApplicationDependencies(builderConfig: BuilderConfiguration<ElectronBuilderSchema>): Observable<BuildEvent>{
-
-
-        return new Observable<BuildEvent>( obs =>{
-            const electronProjectPath : Path = resolve(this.context.workspace.root, normalize(builderConfig.options.electronProjectDir));
-            const electronNodeModulesPath  = getSystemPath(resolve(  electronProjectPath ,normalize('node_modules')));
-            rimraf(electronNodeModulesPath,{rmdir: rmdir}, (error)=>{
-                if(error){
-                    this.context.logger.info(error.message);
-                    obs.error(error);
-                    obs.next({success: false});
-                    obs.complete();
-                }
-            });
-            let electronBuilderExecutable : string ;
-            if(process.platform === 'win32'){
-                electronBuilderExecutable=   'electron-builder.cmd';
-            }else{
-                electronBuilderExecutable= 'electron-builder';
-            }
-            const electronBuilderExecutablePath : string = getSystemPath(join(this.context.workspace.root, 'node_modules' , '.bin', electronBuilderExecutable));
-            const childProcess: ChildProcess = spawn(electronBuilderExecutablePath , ['install-app-deps'] ,{cwd:getSystemPath(electronProjectPath)});
-            const killForkedProcess = () => {
-                if (childProcess && childProcess.pid) {
-                    treeKill(childProcess.pid, 'SIGTERM');
-                }
-            };
-            // Handle child process exit.
-            const handleChildProcessExit = (code) => {
-                killForkedProcess();
-                if (code && code !== 0) {
-                    obs.error();
-                }
-                obs.next({ success: true });
-                obs.complete();
-            };
-            childProcess.once('exit', handleChildProcessExit);
-            childProcess.once('SIGINT', handleChildProcessExit);
-            childProcess.once('uncaughtException', handleChildProcessExit);
-            const handleParentProcessExit = () => {
-                killForkedProcess();
-            };
-            process.once('exit', handleParentProcessExit);
-            process.once('SIGINT', handleParentProcessExit);
-            process.once('uncaughtException', handleParentProcessExit);
-        })
+    installElectronApplicationDependencies(builderConfig: BuilderConfiguration<ElectronBuilderSchema>): Observable<BuildEvent> {
 
+        return runModuleAsObservableFork(
+            getSystemPath(this.context.workspace.root),
+            '@ng-electron-devkit/builders/dist/electron/build-electron',
+            'installAppDeps',
+            [],
+        );
     }
 }