Merge pull request #4479 from NativeScript/release-patch

chore: merge release-patch in release

Author: Fatme

lib/commands/preview.ts

@@ -29,7 +29,11 @@ export class PreviewCommand implements ICommand {
 			env: this.$options.env
 		});
 
-		await this.$previewQrCodeService.printLiveSyncQrCode({ useHotModuleReload: this.$options.hmr, link: this.$options.link });
+		await this.$previewQrCodeService.printLiveSyncQrCode({
+			projectDir: this.$projectData.projectDir,
+			useHotModuleReload: this.$options.hmr,
+			link: this.$options.link
+		});
 	}
 
 	public async canExecute(args: string[]): Promise<boolean> {

lib/common/declarations.d.ts

@@ -596,7 +596,8 @@ declare const enum ErrorCodes {
 	KARMA_FAIL = 130,
 	UNHANDLED_REJECTION_FAILURE = 131,
 	DELETED_KILL_FILE = 132,
-	TESTS_INIT_REQUIRED = 133
+	TESTS_INIT_REQUIRED = 133,
+	ALL_DEVICES_DISCONNECTED = 134
 }
 
 interface IFutureDispatcher {

lib/common/mobile/android/android-device.ts

@@ -71,11 +71,16 @@ export class AndroidDevice implements Mobile.IAndroidDevice {
 		const adbStatusInfo = AndroidDevice.ADB_DEVICE_STATUS_INFO[this.status];
 		const type = await this.getType();
 
+		let version = details.release;
+		if (version && version.toLowerCase() === 'q') {
+			version = '10.0.0';
+		}
+
 		this.deviceInfo = {
 			identifier: this.identifier,
 			displayName: details.name,
 			model: details.model,
-			version: details.release,
+			version,
 			vendor: details.brand,
 			platform: this.$devicePlatformsConstants.Android,
 			status: adbStatusInfo ? adbStatusInfo.deviceStatus : this.status,

lib/constants.ts

@@ -1,4 +1,5 @@
 require("colors");
+import { PreviewAppLiveSyncEvents } from "./services/livesync/playground/preview-app-constants";
 
 export const APP_FOLDER_NAME = "app";
 export const APP_RESOURCES_FOLDER_NAME = "App_Resources";
@@ -269,3 +270,13 @@ export class AndroidAppBundleMessages {
 	public static ANDROID_APP_BUNDLE_DOCS_MESSAGE = "What is Android App Bundle: https://docs.nativescript.org/tooling/publishing/android-app-bundle";
 	public static ANDROID_APP_BUNDLE_PUBLISH_DOCS_MESSAGE = "How to use Android App Bundle for publishing: https://docs.nativescript.org/tooling/publishing/publishing-android-apps#android-app-bundle";
 }
+
+export const LiveSyncEvents = {
+	liveSyncStopped: "liveSyncStopped",
+	// In case we name it error, EventEmitter expects instance of Error to be raised and will also raise uncaught exception in case there's no handler
+	liveSyncError: "liveSyncError",
+	previewAppLiveSyncError: PreviewAppLiveSyncEvents.PREVIEW_APP_LIVE_SYNC_ERROR,
+	liveSyncExecuted: "liveSyncExecuted",
+	liveSyncStarted: "liveSyncStarted",
+	liveSyncNotification: "notify"
+};