Merge pull request #3936 from NativeScript/vladimirov/fix-hmr-bundle

fix: passing --hmr must always set bundle option to "webpack"

Author: rosen-vladimirov

lib/common/appbuilder/project/project-base.ts

@@ -21,7 +21,7 @@ export abstract class ProjectBase implements Project.IProjectBase {
 		protected $fs: IFileSystem,
 		protected $logger: ILogger,
 		protected $nativeScriptProjectCapabilities: Project.ICapabilities,
-		protected $options: ICommonOptions,
+		protected $options: IOptions,
 		protected $projectConstants: Project.IConstants,
 		protected $staticConfig: Config.IStaticConfig) {
 		this.configurationSpecificData = Object.create(null);

lib/common/appbuilder/project/project.ts

@@ -9,7 +9,7 @@ export class Project extends ProjectBase {
 		protected $fs: IFileSystem,
 		protected $logger: ILogger,
 		protected $nativeScriptProjectCapabilities: Project.ICapabilities,
-		protected $options: ICommonOptions,
+		protected $options: IOptions,
 		protected $projectConstants: Project.IConstants,
 		protected $staticConfig: Config.IStaticConfig) {
 		super($cordovaProjectCapabilities, $errors, $fs, $logger, $nativeScriptProjectCapabilities, $options, $projectConstants, $staticConfig);

lib/common/appbuilder/proton-bootstrap.ts

@@ -1,12 +1,10 @@
 require("./appbuilder-bootstrap");
 $injector.require("messages", "./messages/messages");
 
-import { OptionsBase } from "../options";
 $injector.require("staticConfig", "./appbuilder/proton-static-config");
 $injector.register("config", {});
 // Proton will track the features and exceptions, so no need of analyticsService here.
 $injector.register("analyiticsService", {});
-$injector.register("options", $injector.resolve(OptionsBase, { options: {}, defaultProfileDir: "" }));
 $injector.requirePublicClass("deviceEmitter", "./appbuilder/device-emitter");
 $injector.requirePublicClass("deviceLogProvider", "./appbuilder/device-log-provider");
 import { installUncaughtExceptionListener } from "../errors";

lib/common/appbuilder/providers/project-files-provider.ts

@@ -18,7 +18,7 @@ export class ProjectFilesProvider extends ProjectFilesProviderBase {
 		private $projectConstants: Project.IConstants,
 		private $injector: IInjector,
 		$mobileHelper: Mobile.IMobileHelper,
-		$options: ICommonOptions) {
+		$options: IOptions) {
 		super($mobileHelper, $options);
 	}
 

lib/common/appbuilder/services/livesync/android-livesync-service.ts

@@ -6,7 +6,7 @@ export class AppBuilderAndroidLiveSyncService extends AndroidLiveSyncService imp
 	constructor(_device: Mobile.IAndroidDevice,
 		$fs: IFileSystem,
 		$mobileHelper: Mobile.IMobileHelper,
-		private $options: ICommonOptions) {
+		private $options: IOptions) {
 		super(_device, $fs, $mobileHelper);
 	}
 

lib/common/appbuilder/services/livesync/ios-livesync-service.ts

@@ -13,7 +13,7 @@ export class IOSLiveSyncService implements IDeviceLiveSyncService {
 		private $injector: IInjector,
 		private $logger: ILogger,
 		private $errors: IErrors,
-		private $options: ICommonOptions,
+		private $options: IOptions,
 		private $iosDeviceOperations: IIOSDeviceOperations) {
 		// If we execute livesync with --watch we do not want to dispose the $iosDeviceOperations.
 		this.$iosDeviceOperations.setShouldDispose(!this.$options.watch);

lib/common/commands/analytics.ts

@@ -19,7 +19,7 @@ class AnalyticsCommand implements ICommand {
 	constructor(protected $analyticsService: IAnalyticsService,
 		private $logger: ILogger,
 		private $errors: IErrors,
-		private $options: ICommonOptions,
+		private $options: IOptions,
 		private settingName: string,
 		private humanReadableSettingName: string) { }
 
@@ -51,7 +51,7 @@ export class UsageReportingCommand extends AnalyticsCommand {
 	constructor(protected $analyticsService: IAnalyticsService,
 		$logger: ILogger,
 		$errors: IErrors,
-		$options: ICommonOptions,
+		$options: IOptions,
 		$staticConfig: Config.IStaticConfig) {
 		super($analyticsService, $logger, $errors, $options, $staticConfig.TRACK_FEATURE_USAGE_SETTING_NAME, "Usage reporting");
 	}
@@ -62,7 +62,7 @@ export class ErrorReportingCommand extends AnalyticsCommand {
 	constructor(protected $analyticsService: IAnalyticsService,
 		$logger: ILogger,
 		$errors: IErrors,
-		$options: ICommonOptions,
+		$options: IOptions,
 		$staticConfig: Config.IStaticConfig
 	) {
 		super($analyticsService, $logger, $errors, $options, $staticConfig.ERROR_REPORT_SETTING_NAME, "Error reporting");

lib/common/commands/device/device-log-stream.ts

@@ -4,7 +4,7 @@ export class OpenDeviceLogStreamCommand implements ICommand {
 	constructor(private $devicesService: Mobile.IDevicesService,
 		private $errors: IErrors,
 		private $commandsService: ICommandsService,
-		private $options: ICommonOptions,
+		private $options: IOptions,
 		private $deviceLogProvider: Mobile.IDeviceLogProvider,
 		private $loggingLevels: Mobile.ILoggingLevels,
 		$iOSSimulatorLogProvider: Mobile.IiOSSimulatorLogProvider) {

lib/common/commands/device/get-file.ts

@@ -3,7 +3,7 @@ export class GetFileCommand implements ICommand {
 		private $stringParameter: ICommandParameter,
 		private $project: Project.IProjectBase,
 		private $errors: IErrors,
-		private $options: ICommonOptions) { }
+		private $options: IOptions) { }
 
 	public allowedParameters: ICommandParameter[] = [this.$stringParameter, this.$stringParameter];
 

lib/common/commands/device/list-applications.ts

@@ -4,7 +4,7 @@ import * as util from "util";
 export class ListApplicationsCommand implements ICommand {
 	constructor(private $devicesService: Mobile.IDevicesService,
 		private $logger: ILogger,
-		private $options: ICommonOptions) { }
+		private $options: IOptions) { }
 
 	allowedParameters: ICommandParameter[] = [];