Merge pull request #3684 from NativeScript/kddimitrov/merge-release-master

KristianDD · web-flow · commit 36a4d52e8ea6 · 2018-06-15T16:37:31.000+03:00
Kddimitrov/merge release master
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,27 @@
 NativeScript CLI Changelog
 ================
 
+4.1.0 (2018, May 31)
+==
+
+### New
+* [Implemented #3321](https://github.com/NativeScript/nativescript-cli/issues/3321): Work simultaneously with multiple iOS Simulators
+* [Implemented #3404](https://github.com/NativeScript/nativescript-cli/issues/3404): Start LiveSync watcher earlier during run
+* [Implemented #3570](https://github.com/NativeScript/nativescript-cli/issues/3570): Add deprecation message for macOS versions under High Sierra
+* [Implemented #3581](https://github.com/NativeScript/nativescript-cli/issues/3581): Drop support for Node.js 4.x.x
+* [Implemented #3582](https://github.com/NativeScript/nativescript-cli/issues/3582): Deprecate support for Node.js 6.x.x
+* [Implemented #3605](https://github.com/NativeScript/nativescript-cli/issues/3605): Support Java 10
+* [Implemented #3636](https://github.com/NativeScript/nativescript-cli/issues/3636): Allow templates to be full applications - BETA support
+* [Implemented #3650](https://github.com/NativeScript/nativescript-cli/issues/3650): Enable using source code in iOS part of plugins
+
+### Fixed
+* [Fixed #1398](https://github.com/NativeScript/nativescript-cli/issues/1398): CLI detects iOS devices connected over Wi-fi and fails to work with them
+* [Fixed #2831](https://github.com/NativeScript/nativescript-cli/issues/2831): `tns debug android --start` releases the terminal session
+* [Fixed #3580](https://github.com/NativeScript/nativescript-cli/pull/3580): API: isValidNativeScriptProject returns incorrect result
+* [Fixed #3593](https://github.com/NativeScript/nativescript-cli/issues/3593): Tracking for used Debug tools is not correct
+* [Fixed #3629](https://github.com/NativeScript/nativescript-cli/issues/3629): `tns debug android --start` does not print application console.logs
+
+
 4.0.2 (2018, May 18)
 ==
 
@@ -14,7 +35,6 @@ NativeScript CLI Changelog
 ### New
 * [Implemented #3535](https://github.com/NativeScript/nativescript-cli/pull/3535) API: Expose androidProcessService - getAppProcessId method
 
-
 ### Fixed
 * [Fixed #1548](https://github.com/NativeScript/nativescript-cli/issues/1548): `--sdk` flag not working properly when starting emulators in iOS
 * [Fixed #2131](https://github.com/NativeScript/nativescript-cli/issues/2131): Simulators with `(` in name are not started after `tns run ios --device <device_name>`
diff --git a/README.md b/README.md
@@ -53,7 +53,7 @@ How the NativeScript CLI works
 
 The NativeScript CLI is the command-line interface for interacting with NativeScript. It incorporates several important services. Consider the following diagram:
 
-![NativeScript CLI diagram](https://github.com/NativeScript/nativescript-cli/blob/master/ns-cli.png)
+![NativeScript CLI diagram](https://github.com/NativeScript/nativescript-cli/raw/release/ns-cli.png)
 
 * **Commands** - pretty much what every CLI does - support of different command options, input validation and help  
 * **Devices Service** - provides the communication between NativeScript and devices/emulators/simulators used to run/debug the app. Uses iTunes to talk to iOS and adb for Android
diff --git a/docs/man_pages/lib-management/plugin-add.md b/docs/man_pages/lib-management/plugin-add.md
@@ -8,6 +8,7 @@ position: 1
 Usage | Synopsis
 ------|-------
 General | `$ tns plugin add <Plugin>`
+Alias | `$ tns plugin install <Plugin>`
 
 <% if(isConsole) { %>Installs the specified plugin and any packages that it depends on.<% } %>
 <% if(isHtml) { %>Installs the specified plugin and its dependencies in the local `node_modules` folder, adds it to the `dependencies` section in `package.json`, and prepares the plugin for all installed platforms. If you have not configured any platforms for the project, the NativeScript CLI will prepare the plugin when you add a platform. For more information about working with plugins, see [NativeScript Plugins](https://github.com/NativeScript/nativescript-cli/blob/master/PLUGINS.md).<% } %>
diff --git a/docs/man_pages/lib-management/plugin-install.md b/docs/man_pages/lib-management/plugin-install.md
@@ -8,6 +8,7 @@ position: 3
 Usage | Synopsis
 ------|-------
 General | `$ tns plugin install <Plugin>`
+Alias | `$ tns plugin add <Plugin>`
 
 <% if(isConsole) { %>Installs the specified plugin and any packages that it depends on.<% } %>
 <% if(isHtml) { %>Installs the specified plugin and its dependencies in the local `node_modules` folder, adds it to the `dependencies` section in `package.json`, and prepares the plugin for all installed platforms. If you have not configured any platforms for the project, the NativeScript CLI will prepare the plugin when you add a platform. For more information about working with plugins, see [NativeScript Plugins](https://github.com/NativeScript/nativescript-cli/blob/master/PLUGINS.md).<% } %>
diff --git a/lib/definitions/livesync.d.ts b/lib/definitions/livesync.d.ts
@@ -337,6 +337,7 @@ interface IPlatformLiveSyncService {
 	fullSync(syncInfo: IFullSyncInfo): Promise<ILiveSyncResultInfo>;
 	liveSyncWatchAction(device: Mobile.IDevice, liveSyncInfo: ILiveSyncWatchInfo): Promise<ILiveSyncResultInfo>;
 	refreshApplication(projectData: IProjectData, liveSyncInfo: ILiveSyncResultInfo): Promise<void>;
+	prepareForLiveSync(device: Mobile.IDevice, data: IProjectDir, liveSyncInfo: ILiveSyncInfo): void;
 }
 
 interface INativeScriptDeviceLiveSyncService extends IDeviceLiveSyncServiceBase {
diff --git a/lib/device-sockets/ios/packet-stream.ts b/lib/device-sockets/ios/packet-stream.ts
@@ -13,7 +13,7 @@ export class PacketStream extends stream.Transform {
 			if (!this.buffer) {
 				// read length
 				const length = packet.readInt32BE(0);
-				this.buffer = new Buffer(length);
+				this.buffer = Buffer.allocUnsafe(length);
 				this.offset = 0;
 				packet = packet.slice(4);
 			}
diff --git a/lib/device-sockets/ios/socket-proxy-factory.ts b/lib/device-sockets/ios/socket-proxy-factory.ts
@@ -124,17 +124,15 @@ export class SocketProxyFactory extends EventEmitter implements ISocketProxyFact
 
 			webSocket.on("message", (message: string) => {
 				const length = Buffer.byteLength(message, encoding);
-				const payload = new Buffer(length + 4);
+				const payload = Buffer.allocUnsafe(length + 4);
 				payload.writeInt32BE(length, 0);
 				payload.write(message, 4, length, encoding);
 				deviceSocket.write(payload);
 			});
 
 			deviceSocket.on("close", () => {
 				this.$logger.info("Backend socket closed!");
-				if (!this.$options.watch) {
-					webSocket.close();
-				}
+				webSocket.close();
 			});
 
 			webSocket.on("close", () => {
diff --git a/lib/services/debug-service.ts b/lib/services/debug-service.ts
@@ -51,6 +51,7 @@ export class DebugService extends EventEmitter implements IDebugService {
 			this.$errors.failWithoutHelp(`Unsupported device OS: ${device.deviceInfo.platform}. You can debug your applications only on iOS or Android.`);
 		}
 
+		// TODO: Consider to move this code to ios-debug-service
 		if (this.$mobileHelper.isiOSPlatform(device.deviceInfo.platform)) {
 			if (device.isEmulator && !debugData.pathToAppPackage && debugOptions.debugBrk) {
 				this.$errors.failWithoutHelp("To debug on iOS simulator you need to provide path to the app package.");
@@ -61,12 +62,10 @@ export class DebugService extends EventEmitter implements IDebugService {
 			} else if (!this.$hostInfo.isDarwin) {
 				this.$errors.failWithoutHelp(`Debugging on iOS devices is not supported for ${platform()} yet.`);
 			}
-
-			result = await debugService.debug(debugData, debugOptions);
-		} else if (this.$mobileHelper.isAndroidPlatform(device.deviceInfo.platform)) {
-			result = await debugService.debug(debugData, debugOptions);
 		}
 
+		result = await debugService.debug(debugData, debugOptions);
+
 		return this.getDebugInformation(result, device.deviceInfo.identifier);
 	}
 
diff --git a/lib/services/ios-debug-service.ts b/lib/services/ios-debug-service.ts
@@ -63,6 +63,8 @@ export class IOSDebugService extends DebugServiceBase implements IPlatformDebugS
 			await this.device.openDeviceLogStream();
 		}
 
+		this.$iOSDebuggerPortService.attachToDebuggerPortFoundEvent(this.device, debugData);
+
 		if (debugOptions.emulator) {
 			if (debugOptions.start) {
 				return this.emulatorStart(debugData, debugOptions);
@@ -142,12 +144,8 @@ export class IOSDebugService extends DebugServiceBase implements IPlatformDebugS
 	}
 
 	private async emulatorStart(debugData: IDebugData, debugOptions: IDebugOptions): Promise<string> {
-		const device = await this.$devicesService.getDevice(debugData.deviceIdentifier);
-		this.$iOSDebuggerPortService.attachToDebuggerPortFoundEvent(device, debugData);
 		const result = await this.wireDebuggerClient(debugData, debugOptions);
-
 		const attachRequestMessage = this.$iOSNotification.getAttachRequest(debugData.applicationIdentifier, debugData.deviceIdentifier);
-
 		const iOSEmulatorService = <Mobile.IiOSSimulatorService>this.$iOSEmulatorServices;
 		await iOSEmulatorService.postDarwinNotification(attachRequestMessage, debugData.deviceIdentifier);
 		return result;
@@ -192,7 +190,7 @@ export class IOSDebugService extends DebugServiceBase implements IPlatformDebugS
 	}
 
 	private async deviceStartCore(device: Mobile.IiOSDevice, debugData: IDebugData, debugOptions: IDebugOptions): Promise<string> {
-		this.$iOSDebuggerPortService.attachToDebuggerPortFoundEvent(device, debugData);
+
 		await this.$iOSSocketRequestExecutor.executeAttachRequest(device, AWAIT_NOTIFICATION_TIMEOUT_SECONDS, debugData.applicationIdentifier);
 		return this.wireDebuggerClient(debugData, debugOptions, device);
 	}
diff --git a/lib/services/livesync/android-device-livesync-service.ts b/lib/services/livesync/android-device-livesync-service.ts
@@ -129,7 +129,7 @@ export class AndroidDeviceLiveSyncService extends DeviceLiveSyncServiceBase impl
 			const socket = new net.Socket();
 
 			socket.connect(this.port, '127.0.0.1', () => {
-				socket.write(new Buffer([0, 0, 0, 1, 1]));
+				socket.write(Buffer.from([0, 0, 0, 1, 1]));
 			});
 			socket.on("data", (data: any) => {
 				isResolved = true;
diff --git a/lib/services/livesync/android-livesync-service.ts b/lib/services/livesync/android-livesync-service.ts
@@ -8,14 +8,15 @@ export class AndroidLiveSyncService extends PlatformLiveSyncServiceBase implemen
 		$devicePathProvider: IDevicePathProvider,
 		$fs: IFileSystem,
 		$logger: ILogger,
-		$projectFilesProvider: IProjectFilesProvider,
-	) {
-		super($fs, $logger, $platformsData, $projectFilesManager, $devicePathProvider, $projectFilesProvider);
+		$projectFilesProvider: IProjectFilesProvider) {
+			super($fs, $logger, $platformsData, $projectFilesManager, $devicePathProvider, $projectFilesProvider);
 	}
 
 	protected _getDeviceLiveSyncService(device: Mobile.IDevice, data: IProjectDir): INativeScriptDeviceLiveSyncService {
 		const service = this.$injector.resolve<INativeScriptDeviceLiveSyncService>(AndroidDeviceLiveSyncService, { _device: device, data });
 		return service;
 	}
+
+	public prepareForLiveSync(device: Mobile.IDevice, data: IProjectDir): void { /* */ }
 }
 $injector.register("androidLiveSyncService", AndroidLiveSyncService);
diff --git a/lib/services/livesync/ios-device-livesync-service.ts b/lib/services/livesync/ios-device-livesync-service.ts
@@ -20,7 +20,6 @@ export class IOSDeviceLiveSyncService extends DeviceLiveSyncServiceBase implemen
 		private $processService: IProcessService,
 		protected $platformsData: IPlatformsData) {
 			super($platformsData);
-			this.$iOSDebuggerPortService.attachToDebuggerPortFoundEvent(_device, data);
 			this.device = _device;
 	}
 
@@ -135,7 +134,7 @@ export class IOSDeviceLiveSyncService extends DeviceLiveSyncServiceBase implemen
 			await new Promise<void>((resolve, reject) => {
 				let isResolved = false;
 				const length = Buffer.byteLength(message, "utf16le");
-				const payload = new Buffer(length + 4);
+				const payload = Buffer.allocUnsafe(length + 4);
 				payload.writeInt32BE(length, 0);
 				payload.write(message, 4, length, "utf16le");
 
diff --git a/lib/services/livesync/ios-livesync-service.ts b/lib/services/livesync/ios-livesync-service.ts
@@ -13,20 +13,16 @@ export class IOSLiveSyncService extends PlatformLiveSyncServiceBase implements I
 		$devicePathProvider: IDevicePathProvider,
 		$logger: ILogger,
 		$projectFilesProvider: IProjectFilesProvider,
-		private $iOSDebuggerPortService: IIOSDebuggerPortService,
-	) {
-		super($fs, $logger, $platformsData, $projectFilesManager, $devicePathProvider, $projectFilesProvider);
-	}
+		private $iOSDebuggerPortService: IIOSDebuggerPortService) {
+			super($fs, $logger, $platformsData, $projectFilesManager, $devicePathProvider, $projectFilesProvider);
+		}
 
 	public async fullSync(syncInfo: IFullSyncInfo): Promise<ILiveSyncResultInfo> {
 		const device = syncInfo.device;
 
 		if (device.isEmulator) {
 			return super.fullSync(syncInfo);
 		}
-
-		this.$iOSDebuggerPortService.attachToDebuggerPortFoundEvent(device, syncInfo.projectData);
-
 		const projectData = syncInfo.projectData;
 		const platformData = this.$platformsData.getPlatformData(device.deviceInfo.platform, projectData);
 		const deviceAppData = await this.getAppData(syncInfo);
@@ -70,6 +66,12 @@ export class IOSLiveSyncService extends PlatformLiveSyncServiceBase implements I
 		}
 	}
 
+	public prepareForLiveSync(device: Mobile.IDevice, data: IProjectDir, liveSyncInfo: ILiveSyncInfo): void {
+		if (!liveSyncInfo.skipWatcher) {
+			this.$iOSDebuggerPortService.attachToDebuggerPortFoundEvent(device, data);
+		}
+	}
+
 	protected _getDeviceLiveSyncService(device: Mobile.IDevice, data: IProjectDir): INativeScriptDeviceLiveSyncService {
 		const service = this.$injector.resolve<INativeScriptDeviceLiveSyncService>(IOSDeviceLiveSyncService, { _device: device, data });
 		return service;
diff --git a/lib/services/livesync/livesync-service.ts b/lib/services/livesync/livesync-service.ts
@@ -456,8 +456,11 @@ export class LiveSyncService extends EventEmitter implements IDebugLiveSyncServi
 		const deviceAction = async (device: Mobile.IDevice): Promise<void> => {
 			try {
 				const platform = device.deviceInfo.platform;
+				const platformLiveSyncService = this.getLiveSyncService(platform);
 				const deviceBuildInfoDescriptor = _.find(deviceDescriptors, dd => dd.identifier === device.deviceInfo.identifier);
 
+				platformLiveSyncService.prepareForLiveSync(device, projectData, liveSyncData);
+
 				await this.ensureLatestAppPackageIsInstalledOnDevice({
 					device,
 					preparedPlatforms,
@@ -472,7 +475,7 @@ export class LiveSyncService extends EventEmitter implements IDebugLiveSyncServi
 					env: liveSyncData.env
 				}, { skipNativePrepare: deviceBuildInfoDescriptor.skipNativePrepare });
 
-				const liveSyncResultInfo = await this.getLiveSyncService(platform).fullSync({
+				const liveSyncResultInfo = await platformLiveSyncService.fullSync({
 					projectData, device,
 					syncAllFiles: liveSyncData.watchAllFiles,
 					useLiveEdit: liveSyncData.useLiveEdit,
diff --git a/lib/services/livesync/platform-livesync-service-base.ts b/lib/services/livesync/platform-livesync-service-base.ts
@@ -138,5 +138,4 @@ export abstract class PlatformLiveSyncServiceBase {
 			action.call(this.$logger, util.format(message, "all files"));
 		}
 	}
-
 }
diff --git a/lib/services/project-changes-service.ts b/lib/services/project-changes-service.ts
@@ -66,7 +66,9 @@ export class ProjectChangesService implements IProjectChangesService {
 			this._changesInfo.appFilesChanged = await this.hasChangedAppFiles(projectData);
 
 			this._changesInfo.packageChanged = this.isProjectFileChanged(projectData, platform);
-			this._changesInfo.appResourcesChanged = this.containsNewerFiles(projectData.appResourcesDirectoryPath, null, projectData);
+
+			const platformResourcesDir = path.join(projectData.appResourcesDirectoryPath, platformData.normalizedPlatformName);
+			this._changesInfo.appResourcesChanged = this.containsNewerFiles(platformResourcesDir, null, projectData);
 			/*done because currently all node_modules are traversed, a possible improvement could be traversing only the production dependencies*/
 			this._changesInfo.nativeChanged = this.containsNewerFiles(
 				path.join(projectData.projectDir, NODE_MODULES_FOLDER_NAME),
@@ -77,7 +79,6 @@ export class ProjectChangesService implements IProjectChangesService {
 			if (this._newFiles > 0 || this._changesInfo.nativeChanged) {
 				this._changesInfo.modulesChanged = true;
 			}
-			const platformResourcesDir = path.join(projectData.appResourcesDirectoryPath, platformData.normalizedPlatformName);
 			if (platform === this.$devicePlatformsConstants.iOS.toLowerCase()) {
 				this._changesInfo.configChanged = this.filesChanged([path.join(platformResourcesDir, platformData.configurationFileName),
 				path.join(platformResourcesDir, "LaunchScreen.storyboard"),
diff --git a/lib/services/project-data-service.ts b/lib/services/project-data-service.ts
@@ -143,16 +143,16 @@ export class ProjectDataService implements IProjectDataService {
 					assetElement.filename === image.filename && path.basename(assetElement.directory) === path.basename(dirPath)
 				);
 
-				if (assetItem) {
-					if (image.size) {
-						// size is basically <width>x<height>
-						const [width, height] = image.size.toString().split(AssetConstants.sizeDelimiter);
-						if (width && height) {
-							image.width = +width;
-							image.height = +height;
-						}
+				if (image.size) {
+					// size is basically <width>x<height>
+					const [width, height] = image.size.toString().split(AssetConstants.sizeDelimiter);
+					if (width && height) {
+						image.width = +width;
+						image.height = +height;
 					}
+				}
 
+				if (assetItem) {
 					if (!image.width || !image.height) {
 						image.width = assetItem.width;
 						image.height = assetItem.height;
diff --git a/lib/services/project-service.ts b/lib/services/project-service.ts
@@ -79,7 +79,8 @@ export class ProjectService implements IProjectService {
 				ignoreScripts
 			});
 
-			const templatePackageJson = this.$fs.readJson(path.join(templatePath, constants.PACKAGE_JSON_FILE_NAME));
+			const templatePackageJsonPath = templateVersion === constants.TemplateVersions.v2 ? path.join(projectDir, constants.PACKAGE_JSON_FILE_NAME) : path.join(templatePath, constants.PACKAGE_JSON_FILE_NAME);
+			const templatePackageJson = this.$fs.readJson(templatePackageJsonPath);
 
 			await this.$npm.uninstall(templatePackageJson.name, { save: true }, projectDir);
 			if (templateVersion === constants.TemplateVersions.v2) {
diff --git a/npm-shrinkwrap.json b/npm-shrinkwrap.json
diff --git a/package.json b/package.json
@@ -41,9 +41,9 @@
     "gaze": "1.1.0",
     "iconv-lite": "0.4.11",
     "inquirer": "0.9.0",
-    "ios-device-lib": "0.4.13",
+    "ios-device-lib": "0.4.14",
     "ios-mobileprovision-finder": "1.0.10",
-    "ios-sim-portable": "3.4.4",
+    "ios-sim-portable": "3.4.5",
     "jimp": "0.2.28",
     "lockfile": "1.0.3",
     "lodash": "4.13.1",
diff --git a/vendor/gradle-plugin/build.gradle b/vendor/gradle-plugin/build.gradle
@@ -1,8 +1,8 @@
 
 buildscript {
     repositories {
-        jcenter()
         google()
+        jcenter()
     }
     dependencies {
         classpath 'com.android.tools.build:gradle:3.1.2'

Original file line number	Diff line number	Diff line change
`@@ -337,6 +337,7 @@ interface IPlatformLiveSyncService {`
`337`	`337`	`fullSync(syncInfo: IFullSyncInfo): Promise<ILiveSyncResultInfo>;`
`338`	`338`	`liveSyncWatchAction(device: Mobile.IDevice, liveSyncInfo: ILiveSyncWatchInfo): Promise<ILiveSyncResultInfo>;`
`339`	`339`	`refreshApplication(projectData: IProjectData, liveSyncInfo: ILiveSyncResultInfo): Promise<void>;`
	`340`	`+ prepareForLiveSync(device: Mobile.IDevice, data: IProjectDir, liveSyncInfo: ILiveSyncInfo): void;`
`340`	`341`	`}`
`341`	`342`
`342`	`343`	`interface INativeScriptDeviceLiveSyncService extends IDeviceLiveSyncServiceBase {`
Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,7 @@ export class PacketStream extends stream.Transform {`
`13`	`13`	`if (!this.buffer) {`
`14`	`14`	`// read length`
`15`	`15`	`const length = packet.readInt32BE(0);`
`16`		`- this.buffer = new Buffer(length);`
	`16`	`+ this.buffer = Buffer.allocUnsafe(length);`
`17`	`17`	`this.offset = 0;`
`18`	`18`	`packet = packet.slice(4);`
`19`	`19`	`}`
Original file line number	Diff line number	Diff line change
`@@ -51,6 +51,7 @@ export class DebugService extends EventEmitter implements IDebugService {`
`51`	`51`	this.$errors.failWithoutHelp(`Unsupported device OS: ${device.deviceInfo.platform}. You can debug your applications only on iOS or Android.`);
`52`	`52`	`}`
`53`	`53`
	`54`	`+ // TODO: Consider to move this code to ios-debug-service`
`54`	`55`	`if (this.$mobileHelper.isiOSPlatform(device.deviceInfo.platform)) {`
`55`	`56`	`if (device.isEmulator && !debugData.pathToAppPackage && debugOptions.debugBrk) {`
`56`	`57`	`this.$errors.failWithoutHelp("To debug on iOS simulator you need to provide path to the app package.");`
`@@ -61,12 +62,10 @@ export class DebugService extends EventEmitter implements IDebugService {`
`61`	`62`	`} else if (!this.$hostInfo.isDarwin) {`
`62`	`63`	this.$errors.failWithoutHelp(`Debugging on iOS devices is not supported for ${platform()} yet.`);
`63`	`64`	`}`
`64`		`-`
`65`		`- result = await debugService.debug(debugData, debugOptions);`
`66`		`- } else if (this.$mobileHelper.isAndroidPlatform(device.deviceInfo.platform)) {`
`67`		`- result = await debugService.debug(debugData, debugOptions);`
`68`	`65`	`}`
`69`	`66`
	`67`	`+ result = await debugService.debug(debugData, debugOptions);`
	`68`	`+`
`70`	`69`	`return this.getDebugInformation(result, device.deviceInfo.identifier);`
`71`	`70`	`}`
`72`	`71`