From ffe54fb99fb23f36c0ef0df7158f0760d015f8b4 Mon Sep 17 00:00:00 2001
From: sis0k0 <stanimira.vlaeva@gmail.com>
Date: Tue, 11 Sep 2018 11:13:47 +0300
Subject: [PATCH] fix-next: pass --env.hmr only if the --hmr flag is raised

---
 lib/before-prepareJS.js |  5 +++-
 lib/before-watch.js     | 56 +++++++++++++++++++++--------------------
 lib/compiler.js         |  4 +--
 3 files changed, 35 insertions(+), 30 deletions(-)

diff --git a/lib/before-prepareJS.js b/lib/before-prepareJS.js
index a1b9a6dd..4e71fe40 100644
--- a/lib/before-prepareJS.js
+++ b/lib/before-prepareJS.js
@@ -2,7 +2,10 @@ const { runWebpackCompiler } = require("./compiler");
 
 module.exports = function ($logger, $liveSyncService, $options, hookArgs) {
     const env = hookArgs.config.env || {};
-    env.hmr = !!$options.hmr;
+    if ($options.hmr) {
+        env.hmr = true;
+    }
+
     const platform = hookArgs.config.platform;
     const appFilesUpdaterOptions = hookArgs.config.appFilesUpdaterOptions;
     const config = {
diff --git a/lib/before-watch.js b/lib/before-watch.js
index db89c4bf..94bbf90c 100644
--- a/lib/before-watch.js
+++ b/lib/before-watch.js
@@ -1,33 +1,35 @@
 const { getWebpackProcesses, runWebpackCompiler, stopWebpackCompiler } = require("./compiler");
 
 module.exports = function ($logger, $liveSyncService, $options, $devicesService, hookArgs) {
-	if (hookArgs.config) {
-		const appFilesUpdaterOptions = hookArgs.config.appFilesUpdaterOptions;
-		if (appFilesUpdaterOptions.bundle) {
-			$liveSyncService.on("liveSyncStopped", data => {
-				const webpackProcesses = getWebpackProcesses();
-				Object.keys(webpackProcesses).forEach(platform => {
-					const devices = $devicesService.getDevicesForPlatform(platform);
-					if (!devices || !devices.length) {
-						stopWebpackCompiler(platform);
-					}
-				});
-			});
+    if (hookArgs.config) {
+        const appFilesUpdaterOptions = hookArgs.config.appFilesUpdaterOptions;
+        if (appFilesUpdaterOptions.bundle) {
+            $liveSyncService.on("liveSyncStopped", data => {
+                const webpackProcesses = getWebpackProcesses();
+                Object.keys(webpackProcesses).forEach(platform => {
+                    const devices = $devicesService.getDevicesForPlatform(platform);
+                    if (!devices || !devices.length) {
+                        stopWebpackCompiler(platform);
+                    }
+                });
+            });
 
-			const platforms = hookArgs.config.platforms;
-			return Promise.all(platforms.map(platform => {
-				const env = hookArgs.config.env || {};
-				env.hmr = !!$options.hmr;
-				const config = {
-					env,
-					platform,
-					bundle: appFilesUpdaterOptions.bundle,
-					release: appFilesUpdaterOptions.release,
-					watch: true
-				};
+            const platforms = hookArgs.config.platforms;
+            return Promise.all(platforms.map(platform => {
+                const env = hookArgs.config.env || {};
+                if ($options.hmr) {
+                    env.hmr = true;
+                }
+                const config = {
+                    env,
+                    platform,
+                    bundle: appFilesUpdaterOptions.bundle,
+                    release: appFilesUpdaterOptions.release,
+                    watch: true
+                };
 
-				return runWebpackCompiler(config, hookArgs.projectData, $logger, $liveSyncService, hookArgs);
-			}));
-		}
-	}
+                return runWebpackCompiler(config, hookArgs.projectData, $logger, $liveSyncService, hookArgs);
+            }));
+        }
+    }
 }
diff --git a/lib/compiler.js b/lib/compiler.js
index 8f2bea7f..8ba42f9c 100644
--- a/lib/compiler.js
+++ b/lib/compiler.js
@@ -135,12 +135,12 @@ function buildEnvCommandLineParams(config, envData, $logger) {
     const args = [];
     envFlagNames.map(item => {
         let envValue = envData[item];
-        if(!Array.isArray(envValue)) {
+        if (!Array.isArray(envValue)) {
             envValue = [envValue];
         }
         envValue.map(value => args.push(`--env.${item}=${value}`))
     });
-    
+
     return args;
 }