Merge pull request #572 from TomoyukiAota/feature/live-reload-mode-wi…

…th-command-line-option

Rename the command line option from --serve to --live-reload. Determine live reload mode using CommandLineOptions object created by commander npm package.

package.json

@@ -15,13 +15,13 @@
   "scripts": {
     "postinstall": "electron-builder install-app-deps",
     "ng": "ng",
-    "start": "npm-run-all -p ng:serve electron:serve",
+    "start": "npm-run-all -p ng:serve electron:live-reload",
     "build": "npm run build:src-main && ng build",
     "build:dev": "npm run build -- -c dev",
     "build:prod": "npm run build -- -c production",
     "build:src-main": "tsc -p tsconfig.src-main.json",
     "ng:serve": "ng serve -c production",
-    "electron:serve": "wait-on http-get://localhost:4200/ && npm run build:src-main && electron . --serve",
+    "electron:live-reload": "wait-on http-get://localhost:4200/ && npm run build:src-main && electron . --live-reload",
     "electron:local": "npm run build:prod && electron .",
     "electron-builder:linux": "npm run build:prod && electron-builder build --linux",
     "electron-builder:mac": "npm run build:prod && electron-builder build --mac",

src-main/command-line-options/parse-command-line-options.ts

@@ -4,7 +4,7 @@ import { commandLineOptionsValue } from './command-line-options-value';
 export function parseCommandLineOptions() {
   const program = new Command();
   program
-    .addOption(new Option('--serve', 'launch the app in live-reload mode for development').hideHelp())
+    .addOption(new Option('--live-reload', 'launch the app in live-reload mode for development').hideHelp())
     .option('--open <path>', 'open the specified file or folder after the app is launched')
     .parse(process.argv, { from: 'electron' });
   commandLineOptionsValue.set(program.opts());

src-main/live-reload.ts

@@ -1,6 +1,5 @@
-const args = process.argv.slice(1);
-const isLiveReloadMode = args.some(val => val === '--serve');
+import { commandLineOptionsValue } from './command-line-options/command-line-options-value';
 
 export class LiveReload {
-  public static get enabled() { return isLiveReloadMode; }
+  public static get enabled() { return commandLineOptionsValue.get().liveReload; }
 }

src-main/record-at-app-launch.ts

@@ -22,7 +22,7 @@ const recordCommandLineOptions = () => {
   Logger.info(`process.argv:\n${toLoggableString(process.argv)}`);
   const options = commandLineOptionsValue.get();
   Logger.info(`Parsed command line options:\n${toLoggableString(options)}`);
-  Analytics.trackEvent('Command Line Options', 'Command Line Options: "--serve"', `Is "--serve" set? -> ${!!options.serve}`);
+  Analytics.trackEvent('Command Line Options', 'Command Line Options: "--live-reload"', `Is "--live-reload" set? -> ${!!options.liveReload}`);
   Analytics.trackEvent('Command Line Options', 'Command Line Options: "--open <path>"', `Is "--open <path>" set? -> ${!!options.open}`);
 };
 

src-shared/command-line-options/command-line-options.ts

@@ -1,4 +1,4 @@
 export interface CommandLineOptions {
-  serve?: boolean;
+  liveReload?: boolean;
   open?: string;
 }