Merge branch 'main' of github.com:farfromrefug/nativescript-cli

Author: farfromrefug

.prettierrc.json

@@ -1,3 +1,11 @@
 {
-  "useTabs": true
+  "useTabs": true,
+  "overrides": [
+    {
+      "files": "*.json",
+      "options": {
+        "useTabs": false
+      }
+    }
+  ]
 }

CHANGELOG.md

@@ -1,3 +1,29 @@
+## [8.7.2](https://github.com/NativeScript/nativescript-cli/compare/v8.7.1...v8.7.2) (2024-05-28)
+
+### Bug Fixes
+
+* fix `npm i -g nativescript` on npm 10.4.0+ ([9d2ec7c](https://github.com/NativeScript/nativescript-cli/commit/9d2ec7cb6a12ea10439ea287991812645a156473))
+
+### Features
+
+* don't uninstall app by default ([bac14c0](https://github.com/NativeScript/nativescript-cli/commit/bac14c06568c7a0538618d9ca1e369a56dd272b5))
+
+
+
+## [8.7.1](https://github.com/NativeScript/nativescript-cli/compare/v8.7.0...v8.7.1) (2024-05-16)
+
+
+### Bug Fixes
+
+* **windows:** make compatible with latest node patch levels ([#5802](https://github.com/NativeScript/nativescript-cli/issues/5802)) ([8795e98](https://github.com/NativeScript/nativescript-cli/commit/8795e98e7876d11ac0032135607fb13bf00d246d))
+
+
+### Features
+
+* interactive typings generation for android ([#5798](https://github.com/NativeScript/nativescript-cli/issues/5798)) ([d3f2e70](https://github.com/NativeScript/nativescript-cli/commit/d3f2e70101d44a9bc8450c5d0b90419945c2604f))
+
+
+
 # [8.7.0](https://github.com/NativeScript/nativescript-cli/compare/v8.6.5...v8.7.0) (2024-04-08)
 
 

Gruntfile.js

@@ -191,21 +191,21 @@ module.exports = function (grunt) {
 		grunt.file.write(CONFIG_DATA.filePath, stringConfigContent);
 	}
 
-	grunt.registerTask("set_live_ga_id", function () {
-		setConfig(CONFIG_DATA.gaKey, GA_TRACKING_IDS[ENVIRONMENTS.live]);
-	});
+	// grunt.registerTask("set_live_ga_id", function () {
+	// 	setConfig(CONFIG_DATA.gaKey, GA_TRACKING_IDS[ENVIRONMENTS.live]);
+	// });
 
-	grunt.registerTask("set_dev_ga_id", function () {
-		setConfig(CONFIG_DATA.gaKey, GA_TRACKING_IDS[ENVIRONMENTS.dev]);
-	});
+	// grunt.registerTask("set_dev_ga_id", function () {
+	// 	setConfig(CONFIG_DATA.gaKey, GA_TRACKING_IDS[ENVIRONMENTS.dev]);
+	// });
 
-	grunt.registerTask("verify_live_ga_id", function () {
-		var configJson = grunt.file.readJSON(CONFIG_DATA.filePath);
+	// grunt.registerTask("verify_live_ga_id", function () {
+	// 	var configJson = grunt.file.readJSON(CONFIG_DATA.filePath);
 
-		if (configJson[CONFIG_DATA.gaKey] !== GA_TRACKING_IDS[ENVIRONMENTS.live]) {
-			throw new Error("Google Analytics id is not configured correctly.");
-		}
-	});
+	// 	if (configJson[CONFIG_DATA.gaKey] !== GA_TRACKING_IDS[ENVIRONMENTS.live]) {
+	// 		throw new Error("Google Analytics id is not configured correctly.");
+	// 	}
+	// });
 
 	grunt.registerTask("test", ["ts:devall", "shell:npm_test"]);
 
@@ -214,15 +214,15 @@ module.exports = function (grunt) {
 	grunt.registerTask("prepare", [
 		"clean",
 		"ts:release_build",
-		"generate_unit_testing_dependencies",
-		"verify_unit_testing_dependencies",
-		"shell:npm_test",
+		// "generate_unit_testing_dependencies",
+		// "verify_unit_testing_dependencies",
+		// "shell:npm_test",
 
-		"set_live_ga_id",
-		"verify_live_ga_id"
+		// "set_live_ga_id",
+		// "verify_live_ga_id"
 	]);
 	grunt.registerTask("pack", [
-		"set_package_version",
+		// "set_package_version",
 		"shell:build_package"
 	]);
 

lib/base-package-manager.ts

@@ -111,6 +111,7 @@ export abstract class BasePackageManager implements INodePackageManager {
 		await this.$childProcess.spawnFromEvent(npmExecutable, params, "close", {
 			cwd: opts.cwd,
 			stdio: stdioValue,
+			shell: this.$hostInfo.isWindows,
 		});
 
 		// Whenever calling "npm install" or "yarn add" without any arguments (hence installing all dependencies) no output is emitted on stdout

lib/commands/build.ts

@@ -55,7 +55,7 @@ export abstract class BuildCommandBase extends ValidatePlatformCommandBase {
 			{
 				...this.$options.argv,
 				// we disable buildFilterDevicesArch for build only to ensure we dont use it in production builds
-				buildFilterDevicesArch: false
+				buildFilterDevicesArch: false,
 			}
 		);
 		const outputPath = await this.$buildController.prepareAndBuild(buildData);

lib/commands/plugin/build-plugin.ts

@@ -10,6 +10,7 @@ import { ICommand, ICommandParameter } from "../../common/definitions/commands";
 import { IErrors, IFileSystem } from "../../common/declarations";
 import { injector } from "../../common/yok";
 import { ITempService } from "../../definitions/temp-service";
+import { IProjectData } from "../../definitions/project";
 
 export class BuildPluginCommand implements ICommand {
 	public allowedParameters: ICommandParameter[] = [];
@@ -21,7 +22,8 @@ export class BuildPluginCommand implements ICommand {
 		private $logger: ILogger,
 		private $fs: IFileSystem,
 		private $options: IOptions,
-		private $tempService: ITempService
+		private $tempService: ITempService,
+		private $projectData: IProjectData
 	) {
 		this.pluginProjectPath = path.resolve(this.$options.path || ".");
 	}
@@ -50,14 +52,16 @@ export class BuildPluginCommand implements ICommand {
 		const tempAndroidProject = await this.$tempService.mkdirSync(
 			"android-project"
 		);
-
+		const gradleArgs = (this.$projectData.nsConfig.android.gradleArgs || []).concat(this.$options.gradleArgs || []);
+		const pluginOptions = (this.$projectData.nsConfig.android.plugins || {})[pluginName] || {};
 		const options: IPluginBuildOptions = {
 			gradlePath: this.$options.gradlePath,
-			gradleArgs: this.$options.gradleArgs,
+			gradleArgs,
 			aarOutputDir: platformsAndroidPath,
 			platformsAndroidDirPath: platformsAndroidPath,
 			pluginName: pluginName,
 			tempPluginDirPath: tempAndroidProject,
+			...pluginOptions
 		};
 
 		const androidPluginBuildResult = await this.$androidPluginBuildService.buildAar(

lib/commands/typings.ts

@@ -173,7 +173,7 @@ export class TypingsCommand implements ICommand {
 				this.$hostInfo.isWindows ? "ns.cmd" : "ns",
 				["prepare", "android"],
 				"exit",
-				{ stdio: "inherit" }
+				{ stdio: "inherit", shell: this.$hostInfo.isWindows }
 			);
 		}
 

lib/common/mobile/android/android-device.ts

@@ -13,9 +13,9 @@ interface IAndroidDeviceDetails {
 	name: string;
 	release: string;
 	brand: string;
-	'cpu.abi': string;
-	'cpu.abilist64': string;
-	'cpu.abilist32': string;
+	"cpu.abi": string;
+	"cpu.abilist64": string;
+	"cpu.abilist32": string;
 }
 
 interface IAdbDeviceStatusInfo {
@@ -99,7 +99,10 @@ export class AndroidDevice implements Mobile.IAndroidDevice {
 			identifier: this.identifier,
 			displayName: details.name,
 			model: details.model,
-			abis: details['cpu.abilist64'].split(',').concat(details['cpu.abilist32'].split(',')),
+			abis: [
+				...details["cpu.abilist64"].split(","),
+				...details["cpu.abilist32"].split(","),
+			],
 			version,
 			vendor: details.brand,
 			platform: this.$devicePlatformsConstants.Android,
@@ -115,12 +118,14 @@ export class AndroidDevice implements Mobile.IAndroidDevice {
 			: [DeviceConnectionType.USB];
 
 		if (this.isEmulator) {
-			this.deviceInfo.displayName = await this.$androidEmulatorServices.getRunningEmulatorName(
-				this.identifier
-			);
-			this.deviceInfo.imageIdentifier = await this.$androidEmulatorServices.getRunningEmulatorImageIdentifier(
-				this.identifier
-			);
+			this.deviceInfo.displayName =
+				await this.$androidEmulatorServices.getRunningEmulatorName(
+					this.identifier
+				);
+			this.deviceInfo.imageIdentifier =
+				await this.$androidEmulatorServices.getRunningEmulatorImageIdentifier(
+					this.identifier
+				);
 		}
 
 		this.$logger.trace(this.deviceInfo);
@@ -165,9 +170,10 @@ export class AndroidDevice implements Mobile.IAndroidDevice {
 				// sample line is "ro.build.version.release=4.4" in /system/build.prop
 				// sample line from getprop is:  [ro.build.version.release]: [6.0]
 				// NOTE: some props do not have value: [ro.build.version.base_os]: []
-				const match = /(?:\[?ro\.build\.version|ro\.product|ro\.build)\.(.+?)]?(?:\:|=)(?:\s*?\[)?(.*?)]?$/.exec(
-					value
-				);
+				const match =
+					/(?:\[?ro\.build\.version|ro\.product|ro\.build)\.(.+?)]?(?:\:|=)(?:\s*?\[)?(.*?)]?$/.exec(
+						value
+					);
 				if (match) {
 					parsedDetails[match[1]] = match[2];
 				}
@@ -193,7 +199,8 @@ export class AndroidDevice implements Mobile.IAndroidDevice {
 	}
 
 	private async getType(): Promise<string> {
-		const runningEmulatorIds = await this.$androidEmulatorServices.getRunningEmulatorIds();
+		const runningEmulatorIds =
+			await this.$androidEmulatorServices.getRunningEmulatorIds();
 		if (
 			_.find(runningEmulatorIds, (emulatorId) => emulatorId === this.identifier)
 		) {

lib/common/mobile/android/android-virtual-device-service.ts

@@ -22,7 +22,8 @@ import {
 import { injector } from "../../yok";
 
 export class AndroidVirtualDeviceService
-	implements Mobile.IAndroidVirtualDeviceService {
+	implements Mobile.IAndroidVirtualDeviceService
+{
 	private androidHome: string;
 	private mapEmulatorIdToImageIdentifier: IStringDictionary = {};
 
@@ -211,7 +212,8 @@ export class AndroidVirtualDeviceService
 		let result: ISpawnResult = null;
 		let devices: Mobile.IDeviceInfo[] = [];
 		let errors: string[] = [];
-		const canExecuteAvdManagerCommand = await this.canExecuteAvdManagerCommand();
+		const canExecuteAvdManagerCommand =
+			await this.canExecuteAvdManagerCommand();
 		if (!canExecuteAvdManagerCommand) {
 			errors = [
 				"Unable to execute avdmanager, ensure JAVA_HOME is set and points to correct directory",
@@ -221,7 +223,8 @@ export class AndroidVirtualDeviceService
 		if (canExecuteAvdManagerCommand) {
 			result = await this.$childProcess.trySpawnFromCloseEvent(
 				this.pathToAvdManagerExecutable,
-				["list", "avds"]
+				["list", "avds"],
+				{ shell: this.$hostInfo.isWindows }
 			);
 		} else if (
 			this.pathToAndroidExecutable &&
@@ -403,9 +406,8 @@ export class AndroidVirtualDeviceService
 	private getAvdManagerDeviceInfo(
 		output: string
 	): Mobile.IAvdManagerDeviceInfo {
-		const avdManagerDeviceInfo: Mobile.IAvdManagerDeviceInfo = Object.create(
-			null
-		);
+		const avdManagerDeviceInfo: Mobile.IAvdManagerDeviceInfo =
+			Object.create(null);
 
 		// Split by `\n`, not EOL as the avdmanager and android executables print results with `\n` only even on Windows
 		_.reduce(
@@ -437,9 +439,8 @@ export class AndroidVirtualDeviceService
 			avdFilePath,
 			AndroidVirtualDevice.CONFIG_INI_FILE_NAME
 		);
-		const configIniFileInfo = this.$androidIniFileParser.parseIniFile(
-			configIniFilePath
-		);
+		const configIniFileInfo =
+			this.$androidIniFileParser.parseIniFile(configIniFilePath);
 
 		const iniFilePath = this.getIniFilePath(configIniFileInfo, avdFilePath);
 		const iniFileInfo = this.$androidIniFileParser.parseIniFile(iniFilePath);

lib/common/mobile/application-manager-base.ts

@@ -6,7 +6,8 @@ import * as _ from "lodash";
 
 export abstract class ApplicationManagerBase
 	extends EventEmitter
-	implements Mobile.IDeviceApplicationManager {
+	implements Mobile.IDeviceApplicationManager
+{
 	private lastInstalledAppIdentifiers: string[];
 	private lastAvailableDebuggableApps: Mobile.IDeviceApplicationInformation[];
 	private lastAvailableDebuggableAppViews: IDictionary<
@@ -36,7 +37,7 @@ export abstract class ApplicationManagerBase
 			appIdentifier
 		);
 
-		if (isApplicationInstalled) {
+		if (isApplicationInstalled && buildData?.clean) {
 			await this.uninstallApplication(appIdentifier);
 		}
 
@@ -65,7 +66,8 @@ export abstract class ApplicationManagerBase
 					// use locking, so the next executions will not get into the body, while the first one is still working.
 					// In case we do not break the next executions, we'll report each app as newly installed several times.
 					try {
-						const currentlyInstalledAppIdentifiers = await this.getInstalledApplications();
+						const currentlyInstalledAppIdentifiers =
+							await this.getInstalledApplications();
 						const previouslyInstalledAppIdentifiers =
 							this.lastInstalledAppIdentifiers || [];
 
@@ -122,9 +124,7 @@ export abstract class ApplicationManagerBase
 		appIdentifier?: string,
 		buildData?: IBuildData
 	): Promise<void>;
-	public abstract uninstallApplication(
-		appIdentifier: string
-	): Promise<void>;
+	public abstract uninstallApplication(appIdentifier: string): Promise<void>;
 	public abstract startApplication(
 		appData: Mobile.IApplicationData
 	): Promise<void>;
@@ -190,9 +190,8 @@ export abstract class ApplicationManagerBase
 		_.each(
 			currentlyAvailableAppViews,
 			(currentlyAvailableViews, appIdentifier) => {
-				const previouslyAvailableViews = this.lastAvailableDebuggableAppViews[
-					appIdentifier
-				];
+				const previouslyAvailableViews =
+					this.lastAvailableDebuggableAppViews[appIdentifier];
 
 				const newAvailableViews = _.differenceBy(
 					currentlyAvailableViews,
@@ -229,9 +228,8 @@ export abstract class ApplicationManagerBase
 					}
 				});
 
-				this.lastAvailableDebuggableAppViews[
-					appIdentifier
-				] = currentlyAvailableViews;
+				this.lastAvailableDebuggableAppViews[appIdentifier] =
+					currentlyAvailableViews;
 			}
 		);
 	}