Merge pull request #3696 from NativeScript/fatme/merge-release-4.1.1

Fatme · web-flow · commit b1cad72b7935 · 2018-06-20T15:26:57.000+03:00
chore: Merge release 4.1.1
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,23 @@
 NativeScript CLI Changelog
 ================
 
+4.1.1 (2018, June 19)
+==
+
+### Fixed
+
+* [Fixed #3625](https://github.com/NativeScript/nativescript-cli/issues/3625): `tns run ios --device fakeId` start random emulator
+* [Fixed #3633](https://github.com/NativeScript/nativescript-cli/pull/3633): iOS Debugging: Close frontend socket unconditionally
+* [Fixed #3644](https://github.com/NativeScript/nativescript-cli/issues/3644): `tns run ios --justlaunch` do not exit on real iOS devices
+* [Fixed #3658](https://github.com/NativeScript/nativescript-cli/issues/3658): Don't rebuild application for android when something is changed in App_Resources/iOS
+* [Fixed #3660](https://github.com/NativeScript/nativescript-cli/issues/3660): A deprecation warning is shown when `tns debug ios` command is executed with node v10
+* [Fixed #3662](https://github.com/NativeScript/nativescript-cli/pull/3662): Fix project creation when template v2 is used
+* [Fixed #3666](https://github.com/NativeScript/nativescript-cli/issues/3666): Unable to generate icons when the Contents.json is not generated by Xcode
+* [Fixed #3675](https://github.com/NativeScript/nativescript-cli/pull/3675): File connections to iOS device work for a single app only
+* [Fixed #3677](https://github.com/NativeScript/nativescript-cli/issues/3677): docs: Add alias to plugin add/install
+* [Fixed #3682](https://github.com/NativeScript/nativescript-cli/pull/3682): Use google as default repo when building plugins
+
+
 4.1.0 (2018, May 31)
 ==
 
diff --git a/lib/services/ios-debugger-port-service.ts b/lib/services/ios-debugger-port-service.ts
@@ -51,7 +51,7 @@ export class IOSDebuggerPortService implements IIOSDebuggerPortService {
 	private canStartLookingForDebuggerPort(data: IProjectDir): boolean {
 		const projectData = this.$projectDataService.getProjectData(data && data.projectDir);
 		const frameworkVersion = this.$iOSProjectService.getFrameworkVersion(projectData);
-		return semver.gt(frameworkVersion, IOSDebuggerPortService.MIN_REQUIRED_FRAMEWORK_VERSION);
+		return !frameworkVersion || semver.gt(frameworkVersion, IOSDebuggerPortService.MIN_REQUIRED_FRAMEWORK_VERSION);
 	}
 
 	@cache()
diff --git a/lib/services/platform-project-service-base.ts b/lib/services/platform-project-service-base.ts
@@ -13,7 +13,8 @@ export abstract class PlatformProjectServiceBase extends EventEmitter implements
 	}
 
 	public getFrameworkVersion(projectData: IProjectData): string {
-		return this.$projectDataService.getNSValue(projectData.projectDir, this.getPlatformData(projectData).frameworkPackageName).version;
+		const frameworkData = this.$projectDataService.getNSValue(projectData.projectDir, this.getPlatformData(projectData).frameworkPackageName);
+		return frameworkData && frameworkData.version;
 	}
 
 	protected getAllNativeLibrariesForPlugin(pluginData: IPluginData, platform: string, filter: (fileName: string, _pluginPlatformsFolderPath: string) => boolean): string[] {

Original file line number	Diff line number	Diff line change
`@@ -51,7 +51,7 @@ export class IOSDebuggerPortService implements IIOSDebuggerPortService {`
`51`	`51`	`private canStartLookingForDebuggerPort(data: IProjectDir): boolean {`
`52`	`52`	`const projectData = this.$projectDataService.getProjectData(data && data.projectDir);`
`53`	`53`	`const frameworkVersion = this.$iOSProjectService.getFrameworkVersion(projectData);`
`54`		`- return semver.gt(frameworkVersion, IOSDebuggerPortService.MIN_REQUIRED_FRAMEWORK_VERSION);`
	`54`	`+ return !frameworkVersion \|\| semver.gt(frameworkVersion, IOSDebuggerPortService.MIN_REQUIRED_FRAMEWORK_VERSION);`
`55`	`55`	`}`
`56`	`56`
`57`	`57`	`@cache()`
Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,8 @@ export abstract class PlatformProjectServiceBase extends EventEmitter implements`
`13`	`13`	`}`
`14`	`14`
`15`	`15`	`public getFrameworkVersion(projectData: IProjectData): string {`
`16`		`- return this.$projectDataService.getNSValue(projectData.projectDir, this.getPlatformData(projectData).frameworkPackageName).version;`
	`16`	`+ const frameworkData = this.$projectDataService.getNSValue(projectData.projectDir, this.getPlatformData(projectData).frameworkPackageName);`
	`17`	`+ return frameworkData && frameworkData.version;`
`17`	`18`	`}`
`18`	`19`
`19`	`20`	`protected getAllNativeLibrariesForPlugin(pluginData: IPluginData, platform: string, filter: (fileName: string, _pluginPlatformsFolderPath: string) => boolean): string[] {`