Skip to content

chore: merge release in master #4783

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 8 commits into from
Jun 28, 2019
19 changes: 19 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,25 @@
NativeScript CLI Changelog
================

5.4.2 (2019, June 19)
==

### Fixed
* [Fixed #4732](https://github.com/NativeScript/nativescript-cli/pull/4732): HMR does not work with `tns cloud run ios ...` on Windows


5.4.1 (2019, June 17)
==

### Fixed
* [Fixed #4226](https://github.com/NativeScript/nativescript-cli/issues/4226): Slowly attaching to debugger on real iOS device with bundle
* [Fixed #4584](https://github.com/NativeScript/nativescript-cli/issues/4584): Invalid App Store Icon Error, while uploading an iOS app with CLI generated icons
* [Fixed #4608](https://github.com/NativeScript/nativescript-cli/issues/4608): Misleading message for min runtime version
* [Fixed #4664](https://github.com/NativeScript/nativescript-cli/pull/4664): `tns cloud run...` command does not respect useLegacyWorkflow flag
* [Fixed #4665](https://github.com/NativeScript/nativescript-cli/issues/4665): Incorrect error is shown when unsupported Node.js version is used
* [Fixed #4664](https://github.com/NativeScript/nativescript-cli/pull/4679): `$logger` fails to print null objects
* [Fixed #4665](https://github.com/NativeScript/nativescript-cli/issues/4701): Deprecate support for `tns init` command


5.4.0 (2019, May 15)
==
Expand Down
1 change: 1 addition & 0 deletions lib/common/mobile/ios/device/ios-device.ts
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ export class IOSDevice extends IOSDeviceBase {
private $injector: IInjector,
protected $iOSDebuggerPortService: IIOSDebuggerPortService,
protected $deviceLogProvider: Mobile.IDeviceLogProvider,
protected $logger: ILogger,
protected $lockService: ILockService,
private $iOSSocketRequestExecutor: IiOSSocketRequestExecutor,
private $devicePlatformsConstants: Mobile.IDevicePlatformsConstants,
Expand Down
9 changes: 7 additions & 2 deletions lib/common/mobile/ios/ios-device-base.ts
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ export abstract class IOSDeviceBase implements Mobile.IiOSDevice {
protected abstract $deviceLogProvider: Mobile.IDeviceLogProvider;
protected abstract $iOSDebuggerPortService: IIOSDebuggerPortService;
protected abstract $lockService: ILockService;
protected abstract $logger: ILogger;
abstract deviceInfo: Mobile.IDeviceInfo;
abstract applicationManager: Mobile.IDeviceApplicationManager;
abstract fileSystem: Mobile.IDeviceFileSystem;
Expand All @@ -22,8 +23,12 @@ export abstract class IOSDeviceBase implements Mobile.IiOSDevice {
}

await this.attachToDebuggerFoundEvent(appId, projectName, projectDir);
if (ensureAppStarted) {
await this.applicationManager.startApplication({ appId, projectName, projectDir });
try {
if (ensureAppStarted) {
await this.applicationManager.startApplication({ appId, projectName, projectDir });
}
} catch (err) {
this.$logger.trace(`Unable to start application ${appId} on device ${this.deviceInfo.identifier} in getDebugSocket method. Error is: ${err}`);
}

this.cachedSockets[appId] = await this.getDebugSocketCore(appId);
Expand Down
2 changes: 1 addition & 1 deletion lib/common/mobile/ios/simulator/ios-simulator-device.ts
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ export class IOSSimulator extends IOSDeviceBase implements Mobile.IiOSDevice {
private $iOSEmulatorServices: Mobile.IiOSSimulatorService,
private $iOSNotification: IiOSNotification,
private $iOSSimulatorLogProvider: Mobile.IiOSSimulatorLogProvider,
private $logger: ILogger) {
protected $logger: ILogger) {
super();
this.applicationManager = this.$injector.resolve(applicationManagerPath.IOSSimulatorApplicationManager, { iosSim: this.$iOSSimResolver.iOSSim, device: this });
this.fileSystem = this.$injector.resolve(fileSystemPath.IOSSimulatorFileSystem, { iosSim: this.$iOSSimResolver.iOSSim });
Expand Down