Merge pull request #3263 from NativeScript/vladimirov/cherry-pick-fixes

Cherry-pick fixes from master

Author: rosen-vladimirov

PublicAPI.md

@@ -589,6 +589,8 @@ const liveSyncData = {
 	projectDir,
 	skipWatcher: false,
 	watchAllFiles: false,
+	bundle: false,
+	release: false,
 	useLiveEdit: false
 };
 

lib/common

@@ -432,14 +432,6 @@ interface IInfoService {
 	printComponentsInfo(): Promise<void>;
 }
 
-/**
- * Describes standard username/password type credentials.
- */
-interface ICredentials {
-	username: string;
-	password: string;
-}
-
 /**
  * Describes properties needed for uploading a package to iTunes Connect
  */

lib/declarations.d.ts

@@ -111,7 +111,7 @@ interface ILiveSyncDeviceInfo extends IOptionalOutputPath, IOptionalDebuggingOpt
 /**
  * Describes a LiveSync operation.
  */
-interface ILiveSyncInfo extends IProjectDir, IEnvOptions {
+interface ILiveSyncInfo extends IProjectDir, IEnvOptions, IBundle, IRelease {
 	/**
 	 * Defines if the watcher should be skipped. If not passed, fs.Watcher will be started.
 	 */
@@ -152,7 +152,7 @@ interface IProjectDataComposition {
 /**
  * Desribes object that can be passed to ensureLatestAppPackageIsInstalledOnDevice method.
  */
-interface IEnsureLatestAppPackageIsInstalledOnDeviceOptions extends IProjectDataComposition, IEnvOptions {
+interface IEnsureLatestAppPackageIsInstalledOnDeviceOptions extends IProjectDataComposition, IEnvOptions, IBundle, IRelease {
 	device: Mobile.IDevice;
 	preparedPlatforms: string[];
 	rebuiltInformation: ILiveSyncBuildInfo[];

lib/definitions/livesync.d.ts

@@ -10,7 +10,8 @@ export class GoogleAnalyticsProvider implements IGoogleAnalyticsProvider {
 	constructor(private clientId: string,
 		private $staticConfig: IStaticConfig,
 		private $analyticsSettingsService: IAnalyticsSettingsService,
-		private $logger: ILogger) {
+		private $logger: ILogger,
+		private $proxyService: IProxyService) {
 	}
 
 	public async trackHit(trackInfo: IGoogleAnalyticsData): Promise<void> {
@@ -27,11 +28,16 @@ export class GoogleAnalyticsProvider implements IGoogleAnalyticsProvider {
 	}
 
 	private async track(gaTrackingId: string, trackInfo: IGoogleAnalyticsData, sessionId: string): Promise<void> {
+		const proxySettings = await this.$proxyService.getCache();
+		const proxy = proxySettings && proxySettings.proxy;
 		const visitor = ua({
 			tid: gaTrackingId,
 			cid: this.clientId,
 			headers: {
 				["User-Agent"]: this.$analyticsSettingsService.getUserAgentString(`tnsCli/${this.$staticConfig.version}`)
+			},
+			requestOptions: {
+				proxy
 			}
 		});
 

lib/services/analytics/google-analytics-provider.ts

@@ -32,7 +32,7 @@ export class LiveSyncCommandHelper implements ILiveSyncCommandHelper {
 			this.$iosDeviceOperations.setShouldDispose(false);
 		}
 
-		if (this.$options.release || this.$options.bundle) {
+		if (this.$options.release) {
 			await this.runInReleaseMode(platform);
 			return;
 		}
@@ -75,11 +75,12 @@ export class LiveSyncCommandHelper implements ILiveSyncCommandHelper {
 			skipWatcher: !this.$options.watch,
 			watchAllFiles: this.$options.syncAllFiles,
 			clean: this.$options.clean,
+			bundle: !!this.$options.bundle,
+			release: this.$options.release,
 			env: this.$options.env
 		};
 
 		await this.$liveSyncService.liveSync(deviceDescriptors, liveSyncInfo);
-
 	}
 
 	private async runInReleaseMode(platform: string): Promise<void> {

lib/services/livesync/livesync-command-helper.ts

@@ -362,8 +362,8 @@ export class LiveSyncService extends EventEmitter implements IDebugLiveSyncServi
 			const prepareInfo: IPreparePlatformInfo = {
 				platform,
 				appFilesUpdaterOptions: {
-					bundle: false,
-					release: false,
+					bundle: options.bundle,
+					release: options.release,
 				},
 				projectData: options.projectData,
 				env: options.env,
@@ -459,6 +459,8 @@ export class LiveSyncService extends EventEmitter implements IDebugLiveSyncServi
 					deviceBuildInfoDescriptor,
 					liveSyncData,
 					settings,
+					bundle: liveSyncData.bundle,
+					release: liveSyncData.release,
 					env: liveSyncData.env
 				}, { skipNativePrepare: deviceBuildInfoDescriptor.skipNativePrepare });
 
@@ -564,6 +566,8 @@ export class LiveSyncService extends EventEmitter implements IDebugLiveSyncServi
 										deviceBuildInfoDescriptor,
 										settings: latestAppPackageInstalledSettings,
 										modifiedFiles: allModifiedFiles,
+										bundle: liveSyncData.bundle,
+										release: liveSyncData.release,
 										env: liveSyncData.env
 									}, { skipNativePrepare: deviceBuildInfoDescriptor.skipNativePrepare });
 

lib/services/livesync/livesync-service.ts

@@ -123,6 +123,8 @@ class TestExecutionService implements ITestExecutionService {
 						projectDir: projectData.projectDir,
 						skipWatcher: !this.$options.watch || this.$options.justlaunch,
 						watchAllFiles: this.$options.syncAllFiles,
+						bundle: !!this.$options.bundle,
+						release: this.$options.release,
 						env: this.$options.env
 					};
 
@@ -248,6 +250,8 @@ class TestExecutionService implements ITestExecutionService {
 						projectDir: projectData.projectDir,
 						skipWatcher: !this.$options.watch || this.$options.justlaunch,
 						watchAllFiles: this.$options.syncAllFiles,
+						bundle: !!this.$options.bundle,
+						release: this.$options.release,
 						env: this.$options.env
 					};
 

lib/services/test-execution-service.ts

@@ -54,7 +54,6 @@
     "marked-terminal": "2.0.0",
     "minimatch": "3.0.2",
     "mkdirp": "0.5.1",
-    "moment": "2.10.6",
     "mute-stream": "0.0.5",
     "open": "0.0.5",
     "osenv": "0.1.3",
@@ -64,6 +63,7 @@
     "plistlib": "0.2.1",
     "progress-stream": "1.1.1",
     "properties-parser": "0.2.3",
+    "proxy-lib": "0.2.0",
     "qr-image": "3.2.0",
     "request": "2.81.0",
     "semver": "5.3.0",
@@ -113,6 +113,6 @@
   },
   "license": "Apache-2.0",
   "engines": {
-    "node": ">=6.0.0 <9.0.0"
+    "node": ">=6.0.0 <10.0.0"
   }
 }