Merge branch 'release' into fatme/merge-release

# Conflicts:
#	npm-shrinkwrap.json
#	package.json

Author: Fatme

CHANGELOG.md

@@ -1,6 +1,23 @@
 NativeScript CLI Changelog
 ================
 
+5.3.0 (2019, March 27)
+==
+
+### Implemented
+* [Implemented #3965](https://github.com/NativeScript/nativescript-cli/issues/3965): [Beta] Support for iOS app extensions
+* [Implemented #4389](https://github.com/NativeScript/nativescript-cli/issues/4389): Provide a way to use Hot Module Replacement (`--hmr`) by default for a project
+* [Implemented #4392](https://github.com/NativeScript/nativescript-cli/issues/4392): Ability to run unit tests with `--bundle`
+* [Implemented #4456](https://github.com/NativeScript/nativescript-cli/issues/4456): Official support for Hot Module Replacement (`--hmr`)
+
+### Fixed
+* [Fixed #4403](https://github.com/NativeScript/nativescript-cli/issues/4403): Exception in iOS app entry point not shown in terminal
+* [Fixed #4440](https://github.com/NativeScript/nativescript-cli/issues/4440): `NativeScript can only run in Xcode version 6.0 or greater` error is shown on every iOS command
+* [Fixed #4441](https://github.com/NativeScript/nativescript-cli/issues/4441): Nothing happens with app on device if you delete a file with bundle
+* [Fixed #4458](https://github.com/NativeScript/nativescript-cli/issues/4458): Warnings for short imports are shown for browser code
+* [Fixed #4459](https://github.com/NativeScript/nativescript-cli/pull/4459): API: Raise `debuggerAttached` only if app is restarted during debug
+
+
 5.2.3 (2019, March 12)
 ==
 

lib/commands/debug.ts

@@ -66,10 +66,6 @@ export class DebugPlatformCommand extends ValidatePlatformCommandBase implements
 			this.$errors.fail("--release flag is not applicable to this command");
 		}
 
-		if (this.$options.hmr && this.$options.debugBrk) {
-			this.$errors.fail("--debug-brk and --hmr flags cannot be combined");
-		}
-
 		const minSupportedWebpackVersion = this.$options.hmr ? LiveSyncCommandHelper.MIN_SUPPORTED_WEBPACK_VERSION_WITH_HMR : null;
 		this.$bundleValidatorHelper.validate(minSupportedWebpackVersion);
 

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/definitions/mobile.d.ts

@@ -106,7 +106,7 @@ declare module Mobile {
 	}
 
 	interface IiOSDevice extends IDevice {
-		getDebugSocket(appId: string, projectName: string): Promise<any>;
+		getDebugSocket(appId: string, projectName: string, ensureAppStarted?: boolean): Promise<any>;
 		destroyDebugSocket(appId: string): Promise<void>;
 		openDeviceLogStream(options?: IiOSLogStreamOptions): Promise<void>;
 		destroyAllSockets(): Promise<void>;

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/common/mobile/ios/ios-device-base.ts

@@ -15,15 +15,18 @@ export abstract class IOSDeviceBase implements Mobile.IiOSDevice {
 	abstract openDeviceLogStream(options?: Mobile.IiOSLogStreamOptions): Promise<void>;
 
 	@performanceLog()
-	public async getDebugSocket(appId: string, projectName: string): Promise<net.Socket> {
+	public async getDebugSocket(appId: string, projectName: string, ensureAppStarted: boolean = false): Promise<net.Socket> {
 		return this.$lockService.executeActionWithLock(
 			async () => {
 				if (this.cachedSockets[appId]) {
 					return this.cachedSockets[appId];
 				}
 
 				await this.attachToDebuggerFoundEvent(appId, projectName);
-				await this.applicationManager.startApplication({ appId, projectName });
+				if (ensureAppStarted) {
+					await this.applicationManager.startApplication({ appId, projectName });
+				}
+
 				this.cachedSockets[appId] = await this.getDebugSocketCore(appId);
 
 				if (this.cachedSockets[appId]) {

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"
+};