fix: start using the hmr option from the hookArgs in order to support it in sidekick (#666)

Author: Dimitar Tachev

lib/after-prepare.js

@@ -3,6 +3,7 @@ const { shouldSnapshot } = require("./utils");
 
 module.exports = function (hookArgs) {
 	const env = hookArgs.env || {};
+	env.hmr = hookArgs.appFilesUpdaterOptions.useHotModuleReload;
 	const shouldSnapshotOptions = {
 		platform: hookArgs.platform,
 		bundle: hookArgs.appFilesUpdaterOptions.bundle,

lib/before-prepareJS.js

@@ -1,13 +1,10 @@
 const { runWebpackCompiler } = require("./compiler");
 
-module.exports = function ($logger, $liveSyncService, $options, hookArgs) {
-    const env = hookArgs.config.env || {};
-    if ($options.hmr) {
-        env.hmr = true;
-    }
-
+module.exports = function ($logger, $liveSyncService, hookArgs) {
     const platform = hookArgs.config.platform;
     const appFilesUpdaterOptions = hookArgs.config.appFilesUpdaterOptions;
+    const env = hookArgs.config.env || {};
+    env.hmr = appFilesUpdaterOptions.useHotModuleReload;
     const config = {
         env,
         platform,

lib/before-preview-sync.js

@@ -1,11 +1,11 @@
 const { runWebpackCompiler } = require("./compiler");
 
-module.exports = function($logger, $liveSyncService, $options, hookArgs) {
+module.exports = function($logger, $liveSyncService, hookArgs) {
 	const { config } = hookArgs;
 	const bundle = config && config.appFilesUpdaterOptions && config.appFilesUpdaterOptions.bundle;
 	if (bundle) {
 		const env = config.env || {};
-		env.hmr = !!$options.hmr;
+		env.hmr = config.appFilesUpdaterOptions.useHotModuleReload;
 		const platform = config.platform;
 		const release = config && config.appFilesUpdaterOptions && config.appFilesUpdaterOptions.release;
 		const compilerConfig = {

lib/before-watch.js

@@ -1,6 +1,6 @@
 const { getWebpackProcesses, runWebpackCompiler, stopWebpackCompiler } = require("./compiler");
 
-module.exports = function ($logger, $liveSyncService, $options, $devicesService, hookArgs) {
+module.exports = function ($logger, $liveSyncService, $devicesService, hookArgs) {
     if (hookArgs.config) {
         const appFilesUpdaterOptions = hookArgs.config.appFilesUpdaterOptions;
         if (appFilesUpdaterOptions.bundle) {
@@ -21,9 +21,7 @@ module.exports = function ($logger, $liveSyncService, $options, $devicesService,
             const platforms = hookArgs.config.platforms;
             return Promise.all(platforms.map(platform => {
                 const env = hookArgs.config.env || {};
-                if ($options.hmr) {
-                    env.hmr = true;
-                }
+                env.hmr = appFilesUpdaterOptions.useHotModuleReload;
                 const config = {
                     env,
                     platform,