Merge remote-tracking branch 'nativescript/main' into new_big_merge_test

# Conflicts:
#	lib/services/plugins-service.ts

Author: farfromrefug

CHANGELOG.md

@@ -1,3 +1,12 @@
+## [8.6.4](https://github.com/NativeScript/nativescript-cli/compare/v8.6.3...v8.6.4) (2024-01-17)
+
+
+### Bug Fixes
+
+* skip log-source-maps for large files ([#5780](https://github.com/NativeScript/nativescript-cli/issues/5780)) ([c53b4e9](https://github.com/NativeScript/nativescript-cli/commit/c53b4e9111f3da98547ec273c92a73ead89aca13))
+
+
+
 ## [8.6.1](https://github.com/NativeScript/nativescript-cli/compare/v8.6.0...v8.6.1) (2023-10-23)
 
 

README.md

@@ -14,7 +14,7 @@
 
 ---
 
-[![nativescript -> npm](https://github.com/NativeScript/nativescript-cli/actions/workflows/npm_release.yml/badge.svg)](https://github.com/NativeScript/nativescript-cli/actions/workflows/npm_release.yml)
+[![nativescript -> npm](https://github.com/NativeScript/nativescript-cli/actions/workflows/npm_release_cli.yml/badge.svg)](https://github.com/NativeScript/nativescript-cli/actions/workflows/npm_release_cli.yml)
 
 Get it using: `npm install -g nativescript`
 
@@ -96,7 +96,7 @@ The NativeScript CLI is available for installing as an npm package.
 
 In the command prompt, run the following command.
 
-OS | Node.js installed from http://nodejs.org/ | Node.js installed via package manager
+OS | Node.js installed from https://nodejs.org/ | Node.js installed via package manager
 ---|---------------------|----
 Windows | `npm install nativescript -g` | `npm install nativescript -g`
 macOS | `sudo npm install nativescript -g --unsafe-perm` | `npm install nativescript -g`
@@ -265,7 +265,7 @@ The NativeScript CLI calls the SDK for the selected target platform and uses it
 
 When you build for iOS, the NativeScript CLI will either build for a device, if there's a device attached, or for the native emulator if there are no devices attached. To trigger a native emulator build when a device is attached, set the `--emulator` flag.
 
-> **IMPORTANT:** To build your app for an iOS device, you must configure a valid certificate and provisioning profile pair, and have that pair present on your system for code signing your application package. For more information, see [iOS Code Signing - A Complete Walkthrough](http://seventhsoulmountain.blogspot.com/2013/09/ios-code-sign-in-complete-walkthrough.html).
+> **IMPORTANT:** To build your app for an iOS device, you must configure a valid certificate and provisioning profile pair, and have that pair present on your system for code signing your application package. For more information, see [iOS Code Signing - A Complete Walkthrough](https://seventhsoulmountain.blogspot.com/2013/09/ios-code-sign-in-complete-walkthrough.html).
 
 [Back to Top][1]
 
@@ -355,10 +355,10 @@ This software is licensed under the Apache 2.0 license, quoted <a href="LICENSE"
 [Back to Top][1]
 
 [1]: #nativescript-command-line-interface
-[2]: https://www.progress.com/nativescript
+[2]: https://nativescript.org
 [3]: https://github.com/nativescript/docs
 [4]: https://docs.nativescript.org/
 [5]: https://docs.nativescript.org/api-reference
 [6]: https://www.nativescript.org/faq
 [7]: https://docs.nativescript.org/core-concepts/technical-overview
-[8]: http://blogs.telerik.com/valentinstoychev/posts.aspx/14-06-12/announcing-nativescript---cross-platform-framework-for-building-native-mobile-applications
+[8]: https://www.telerik.com/blogs/announcing-nativescript---cross-platform-framework-for-building-native-mobile-applications

docs/man_pages/project/configuration/open-android.md

@@ -0,0 +1,27 @@
+<% if (isJekyll) { %>---
+title: ns open android
+position: 10
+---<% } %>
+
+# ns open android
+
+### Description
+
+Opens the Android native project from the corresponding `platforms` directory. 
+
+If the native project has not already been generated, the `prepare` command will be issued to generate the project, and the project will then be opened.
+
+### Commands
+
+Usage | Synopsis
+------|-------
+Open the project in Android Studio | `$ ns open android`
+
+<% if(isHtml) { %>
+
+### Related Commands
+
+Command | Description
+----------|----------
+[prepare](prepare.html) | Copies common and relevant platform-specific content from the app directory to the subdirectory for the selected target platform in the platforms directory.
+<% } %>

docs/man_pages/project/configuration/open-ios.md

@@ -0,0 +1,31 @@
+<% if (isJekyll) { %>---
+title: ns open ios
+position: 10
+---<% } %>
+
+# ns open ios
+
+### Description
+
+Opens the iOS native project from the corresponding `platforms` directory. 
+
+If the native project has not already been generated, the `prepare` command will be issued to generate the project, and the project will then be opened.
+
+### Commands
+
+Usage | Synopsis
+------|-------
+Open the project in Xcode | `$ ns open ios`
+
+<% if(isHtml) { %>
+
+### Command Limitations
+
+* You can run `$ ns open ios` only on macOS systems.
+
+### Related Commands
+
+Command | Description
+----------|----------
+[prepare](prepare.html) | Copies common and relevant platform-specific content from the app directory to the subdirectory for the selected target platform in the platforms directory.
+<% } %>

docs/man_pages/project/configuration/open.md

@@ -0,0 +1,36 @@
+<% if (isJekyll) { %>---
+title: ns open
+position: 10
+---<% } %>
+
+# ns open
+
+### Description
+
+Opens the iOS/Android native project from the corresponding `platforms` directory. 
+
+If the native project has not already been generated, the `prepare` command will be issued to generate the project, and the project will then be opened.
+
+### Commands
+
+Usage | Synopsis
+------|-------
+<% if((isConsole && isMacOS) || isHtml) { %>General | `$ ns open <Platform>`<% } %><% if(isConsole && (isLinux || isWindows)) { %>General | `$ ns open android`<% } %>
+
+<% if(isMacOS) { %>### Arguments
+`<Platform>` is the target mobile platform for which you want to open the native project. You can set the following target platforms.
+* `android` - Opens the Android project in Android Studio.
+* `ios` - Opens native iOS project in Xcode.<% } %>
+
+<% if(isHtml) { %>
+
+### Command Limitations
+
+* You can run `$ ns open ios` only on macOS systems.
+
+### Related Commands
+
+Command | Description
+----------|----------
+[prepare](prepare.html) | Copies common and relevant platform-specific content from the app directory to the subdirectory for the selected target platform in the platforms directory.
+<% } %>

docs/man_pages/start.md

@@ -49,6 +49,7 @@ Command | Description
 [test `<Platform>`](project/testing/test.html) | Runs the unit tests in your project on a connected physical or virtual device.
 [install](project/configuration/install.html) | Installs all platforms and dependencies described in the `package.json` file in the current directory.
 [plugin](lib-management/plugin.html) | Lets you manage the plugins for your project.
+[open](project/configuration/open.md) | Opens the native project in Xcode/Android Studio.
 
 ## Publishing Commands
 Command | Description

lib/definitions/ios.d.ts

@@ -57,7 +57,7 @@ declare global {
 			buildConfig: IBuildConfig
 		): Promise<string[]>;
 		getXcodeProjectArgs(
-			projectRoot: string,
+			platformData: IPlatformData,
 			projectData: IProjectData
 		): string[];
 	}

lib/device-sockets/ios/app-debug-socket-proxy-factory.ts

@@ -157,7 +157,6 @@ export class AppDebugSocketProxyFactory
 		let currentWebSocket: ws = null;
 		const server = new ws.Server(<any>{
 			port: localPort,
-			host: "localhost",
 			verifyClient: async (
 				info: any,
 				callback: (res: boolean, code?: number, message?: string) => void

lib/key-commands/bootstrap.ts

@@ -15,3 +15,5 @@ injector.requireKeyCommand("n", path);
 
 injector.requireKeyCommand(SpecialKeys.QuestionMark, path);
 injector.requireKeyCommand(SpecialKeys.CtrlC, path);
+injector.requireCommand("open|ios", path);
+injector.requireCommand("open|android", path);

lib/key-commands/index.ts

@@ -3,7 +3,7 @@ import { platform as currentPlatform } from "os";
 import * as path from "path";
 import { color } from "../color";
 import { PrepareCommand } from "../commands/prepare";
-import { IChildProcess } from "../common/declarations";
+import { IChildProcess, IXcodeSelectService } from "../common/declarations";
 import { ICommand } from "../common/definitions/commands";
 import {
 	IKeyCommand,
@@ -16,6 +16,8 @@ import {
 import { injector } from "../common/yok";
 import { IProjectData } from "../definitions/project";
 import { IStartService } from "../definitions/start-service";
+import { IOSProjectService } from "../services/ios-project-service";
+import { IOptions } from "../declarations";
 
 export class A implements IKeyCommand {
 	key: IValidKeyName = "a";
@@ -38,7 +40,7 @@ export class ShiftA implements IKeyCommand {
 	platform: IKeyCommandPlatform = "Android";
 	description: string = "Open android project in Android Studio";
 	willBlockKeyCommandExecution: boolean = true;
-
+	protected isInteractive: boolean = true;
 	constructor(
 		private $logger: ILogger,
 		private $liveSyncCommandHelper: ILiveSyncCommandHelper,
@@ -56,7 +58,9 @@ export class ShiftA implements IKeyCommand {
 				"prepare"
 			) as PrepareCommand;
 			await prepareCommand.execute([this.platform]);
-			process.stdin.resume();
+			if (this.isInteractive) {
+				process.stdin.resume();
+			}
 		}
 
 		const os = currentPlatform();
@@ -93,7 +97,11 @@ export class ShiftA implements IKeyCommand {
 				return;
 			}
 
-			this.$childProcess.exec(`"${studioPath}" "${androidDir}"`);
+			const child = this.$childProcess.spawn(studioPath, [androidDir], {
+				detached: true,
+				stdio: "ignore",
+			});
+			child.unref();
 		} else if (os === "linux") {
 			if (!fs.existsSync(`/usr/local/android-studio/bin/studio.sh`)) {
 				this.$logger.error("Android Studio is not installed");
@@ -105,6 +113,22 @@ export class ShiftA implements IKeyCommand {
 		}
 	}
 }
+export class OpenAndroidCommand extends ShiftA {
+	constructor(
+		$logger: ILogger,
+		$liveSyncCommandHelper: ILiveSyncCommandHelper,
+		$childProcess: IChildProcess,
+		$projectData: IProjectData,
+		private $options: IOptions
+	) {
+		super($logger, $liveSyncCommandHelper, $childProcess, $projectData);
+		this.isInteractive = false;
+	}
+	async execute(): Promise<void> {
+		this.$options.watch = false;
+		super.execute();
+	}
+}
 
 export class I implements IKeyCommand {
 	key: IValidKeyName = "i";
@@ -127,40 +151,83 @@ export class ShiftI implements IKeyCommand {
 	platform: IKeyCommandPlatform = "iOS";
 	description: string = "Open iOS project in Xcode";
 	willBlockKeyCommandExecution: boolean = true;
+	protected isInteractive: boolean = true;
 
 	constructor(
+		private $iOSProjectService: IOSProjectService,
 		private $logger: ILogger,
 		private $childProcess: IChildProcess,
-		private $projectData: IProjectData
+		private $projectData: IProjectData,
+		private $xcodeSelectService: IXcodeSelectService,
+		private $xcodebuildArgsService: IXcodebuildArgsService
 	) {}
 
 	async execute(): Promise<void> {
-		this.$projectData.initializeProjectData();
-		const iosDir = path.resolve(this.$projectData.platformsDir, "ios");
-
-		// TODO: reuse logic for resolving the xcode project file.
-		const xcprojectFile = path.resolve(iosDir);
-
-		if (!fs.existsSync(iosDir)) {
-			const prepareCommand = injector.resolveCommand(
-				"prepare"
-			) as PrepareCommand;
-			await prepareCommand.execute(["ios"]);
-			process.stdin.resume();
-		}
-
 		const os = currentPlatform();
 		if (os === "darwin") {
-			// TODO: remove this, and just use "open path/to/ios/xcworkspace or xcproject".
-			if (!fs.existsSync("/Applications/Xcode.app")) {
-				this.$logger.error("Xcode is not installed");
-				return;
+			this.$projectData.initializeProjectData();
+			const iosDir = path.resolve(this.$projectData.platformsDir, "ios");
+
+			if (!fs.existsSync(iosDir)) {
+				const prepareCommand = injector.resolveCommand(
+					"prepare"
+				) as PrepareCommand;
+
+				await prepareCommand.execute(["ios"]);
+				if (this.isInteractive) {
+					process.stdin.resume();
+				}
 			}
-			this.$childProcess.exec(`open ${xcprojectFile}`);
+			const platformData = this.$iOSProjectService.getPlatformData(
+				this.$projectData
+			);
+			const xcprojectFile = this.$xcodebuildArgsService.getXcodeProjectArgs(
+				platformData,
+				this.$projectData
+			)[1];
+
+			if (fs.existsSync(xcprojectFile)) {
+				this.$xcodeSelectService
+					.getDeveloperDirectoryPath()
+					.then(() => this.$childProcess.exec(`open ${xcprojectFile}`, {}))
+					.catch((e) => {
+						this.$logger.error(e.message);
+					});
+			} else {
+				this.$logger.error(`Unable to open project file: ${xcprojectFile}`);
+			}
+		} else {
+			this.$logger.error("Opening a project in XCode requires macOS.");
 		}
 	}
 }
 
+export class OpenIOSCommand extends ShiftI {
+	constructor(
+		$iOSProjectService: IOSProjectService,
+		$logger: ILogger,
+		$childProcess: IChildProcess,
+		$projectData: IProjectData,
+		$xcodeSelectService: IXcodeSelectService,
+		$xcodebuildArgsService: IXcodebuildArgsService,
+		private $options: IOptions
+	) {
+		super(
+			$iOSProjectService,
+			$logger,
+			$childProcess,
+			$projectData,
+			$xcodeSelectService,
+			$xcodebuildArgsService
+		);
+		this.isInteractive = false;
+	}
+	async execute(): Promise<void> {
+		this.$options.watch = false;
+		super.execute();
+	}
+}
+
 export class R implements IKeyCommand {
 	key: IValidKeyName = "r";
 	platform: IKeyCommandPlatform = "all";
@@ -317,3 +384,6 @@ injector.registerKeyCommand("A", ShiftA);
 injector.registerKeyCommand("n", N);
 injector.registerKeyCommand(SpecialKeys.QuestionMark, QuestionMark);
 injector.registerKeyCommand(SpecialKeys.CtrlC, CtrlC);
+
+injector.registerCommand("open|ios", OpenIOSCommand);
+injector.registerCommand("open|android", OpenAndroidCommand);

lib/services/ios/spm-service.ts

@@ -78,7 +78,7 @@ export class SPMService implements ISPMService {
 	) {
 		await this.$xcodebuildCommandService.executeCommand(
 			this.$xcodebuildArgsService
-				.getXcodeProjectArgs(platformData.projectRoot, projectData)
+				.getXcodeProjectArgs(platformData, projectData)
 				.concat([
 					"-destination",
 					"generic/platform=iOS",