Merge pull request #4361 from NativeScript/release-patch

rosen-vladimirov · web-flow · commit dd01baec82bf · 2019-02-13T16:55:41.000+02:00
chore: merge release-patch in release
diff --git a/lib/services/livesync/ios-device-livesync-service.ts b/lib/services/livesync/ios-device-livesync-service.ts
@@ -24,7 +24,12 @@ export class IOSDeviceLiveSyncService extends DeviceLiveSyncServiceBase implemen
 		}
 
 		const appId = projectData.projectIdentifiers.ios;
-		this.socket = await this.device.getDebugSocket(appId, projectData.projectName);
+		try {
+			this.socket = await this.device.getDebugSocket(appId, projectData.projectName);
+		} catch (err) {
+			this.$logger.trace(`Error while connecting to the debug socket. Error is:`, err);
+		}
+
 		if (!this.socket) {
 			return false;
 		}
diff --git a/npm-shrinkwrap.json b/npm-shrinkwrap.json
diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "nativescript",
   "preferGlobal": true,
-  "version": "5.2.0",
+  "version": "5.2.1",
   "author": "Telerik <support@telerik.com>",
   "description": "Command-line interface for building NativeScript projects",
   "bin": {
@@ -50,7 +50,7 @@
     "istextorbinary": "2.2.1",
     "jimp": "0.2.28",
     "lockfile": "1.0.3",
-    "lodash": "4.17.10",
+    "lodash": "4.17.11",
     "log4js": "1.0.1",
     "marked": "0.5.1",
     "marked-terminal": "3.1.1",

Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,12 @@ export class IOSDeviceLiveSyncService extends DeviceLiveSyncServiceBase implemen`
`24`	`24`	`}`
`25`	`25`
`26`	`26`	`const appId = projectData.projectIdentifiers.ios;`
`27`		`- this.socket = await this.device.getDebugSocket(appId, projectData.projectName);`
	`27`	`+ try {`
	`28`	`+ this.socket = await this.device.getDebugSocket(appId, projectData.projectName);`
	`29`	`+ } catch (err) {`
	`30`	+ this.$logger.trace(`Error while connecting to the debug socket. Error is:`, err);
	`31`	`+ }`
	`32`	`+`
`28`	`33`	`if (!this.socket) {`
`29`	`34`	`return false;`
`30`	`35`	`}`