NativeScript · farfromrefug · May 7, 2021 · Jul 27, 2021 · Jul 27, 2021 · Jul 29, 2021
diff --git a/lib/commands/build.ts b/lib/commands/build.ts
@@ -52,7 +52,11 @@ export abstract class BuildCommandBase extends ValidatePlatformCommandBase {
 		const buildData = this.$buildDataService.getBuildData(
 			this.$projectData.projectDir,
 			platform,
-			this.$options
+			{
+				...this.$options.argv,
+				// we disable buildFilterDevicesArch for build only to ensure we dont use it in production builds
+				buildFilterDevicesArch: false
+			}
 		);
 		const outputPath = await this.$buildController.prepareAndBuild(buildData);
 

diff --git a/lib/commands/clean.ts b/lib/commands/clean.ts
@@ -6,6 +6,7 @@ import {
 	IProjectCleanupResult,
 	IProjectCleanupService,
 	IProjectConfigService,
+	IProjectData,
 	IProjectService,
 } from "../definitions/project";
 
@@ -83,6 +84,7 @@ export class CleanCommand implements ICommand {
 	constructor(
 		private $projectCleanupService: IProjectCleanupService,
 		private $projectConfigService: IProjectConfigService,
+		private $projectData: IProjectData,
 		private $terminalSpinnerService: ITerminalSpinnerService,
 		private $projectService: IProjectService,
 		private $prompter: IPrompter,
@@ -108,7 +110,7 @@ export class CleanCommand implements ICommand {
 
 		let pathsToClean = [
 			constants.HOOKS_DIR_NAME,
-			constants.PLATFORMS_DIR_NAME,
+			this.$projectData.getBuildRelativeDirectoryPath(),
 			constants.NODE_MODULES_FOLDER_NAME,
 			constants.PACKAGE_LOCK_JSON_FILE_NAME,
 		];

diff --git a/lib/commands/config.ts b/lib/commands/config.ts
@@ -4,19 +4,26 @@ import { IProjectConfigService } from "../definitions/project";
 import { SupportedConfigValues } from "../tools/config-manipulation/config-transformer";
 import { IErrors } from "../common/declarations";
 import { color } from "../color";
+import { IOptions } from "../declarations";
 
 export class ConfigListCommand implements ICommand {
 	public allowedParameters: ICommandParameter[] = [];
 
 	constructor(
 		private $projectConfigService: IProjectConfigService,
+		private $options: IOptions,
 		private $logger: ILogger
 	) {}
 
 	public async execute(args: string[]): Promise<void> {
 		try {
 			const config = this.$projectConfigService.readConfig();
-			this.$logger.info(this.getValueString(config as SupportedConfigValues));
+			if (this.$options.json) {
+				console.log(JSON.stringify(config))
+			} else {
+				this.$logger.info(this.getValueString(config as SupportedConfigValues));
+
+			}
 		} catch (error) {
 			this.$logger.info("Failed to read config. Error is: ", error);
 		}

diff --git a/lib/commands/typings.ts b/lib/commands/typings.ts
@@ -67,7 +67,7 @@ export class TypingsCommand implements ICommand {
 
 		const dtsGeneratorPath = path.resolve(
 			this.$projectData.projectDir,
-			"platforms",
+			this.$projectData.getBuildRelativeDirectoryPath(),
 			"android",
 			"build-tools",
 			"dts-generator.jar"

diff --git a/lib/common/declarations.d.ts b/lib/common/declarations.d.ts
@@ -1276,6 +1276,11 @@ interface IDashedOption {
 	 * Specifies either a single option key (string), or an array of options that must be followed by option values.
 	 */
 	requiresArg?: any;
+
+	/**
+	 * Set to true to define the option as an array option https://github.com/yargs/yargs/blob/main/docs/api.md#array
+	 */
+	array?: any;
 }
 
 /**

diff --git a/lib/common/definitions/mobile.d.ts b/lib/common/definitions/mobile.d.ts
@@ -99,6 +99,12 @@ declare global {
 			 * For iOS simulators - same as the identifier.
 			 */
 			imageIdentifier?: string;
+
+			/**
+			 *  Optional property describing the architecture of the device
+			 *  Available for Android only
+			 */
+			 abis?: string[];
 		}
 
 		interface IDeviceError extends Error, IDeviceIdentifier {}

diff --git a/lib/common/mobile/android/android-device.ts b/lib/common/mobile/android/android-device.ts
@@ -13,6 +13,9 @@ interface IAndroidDeviceDetails {
 	name: string;
 	release: string;
 	brand: string;
+	'cpu.abi': string;
+	'cpu.abilist64': string;
+	'cpu.abilist32': string;
 }
 
 interface IAdbDeviceStatusInfo {
@@ -96,6 +99,7 @@ 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(',')),
 			version,
 			vendor: details.brand,
 			platform: this.$devicePlatformsConstants.Android,

diff --git a/lib/constants.ts b/lib/constants.ts
@@ -58,6 +58,7 @@ export const BUNDLE_DIR = "bundle";
 export const RESOURCES_DIR = "res";
 export const CONFIG_NS_FILE_NAME = "nsconfig.json";
 export const CONFIG_NS_APP_RESOURCES_ENTRY = "appResourcesPath";
+export const CONFIG_NS_BUILD_ENTRY = "buildPath";
 export const CONFIG_NS_APP_ENTRY = "appPath";
 export const CONFIG_FILE_NAME_DISPLAY = "nativescript.config.(js|ts)";
 export const CONFIG_FILE_NAME_JS = "nativescript.config.js";

diff --git a/lib/controllers/build-controller.ts b/lib/controllers/build-controller.ts
@@ -116,7 +116,7 @@ export class BuildController extends EventEmitter implements IBuildController {
 		);
 
 		if (buildData.copyTo) {
-			this.$buildArtifactsService.copyLatestAppPackage(
+			this.$buildArtifactsService.copyAppPackages(
 				buildData.copyTo,
 				platformData,
 				buildData

diff --git a/lib/controllers/deploy-controller.ts b/lib/controllers/deploy-controller.ts
@@ -23,11 +23,10 @@ export class DeployController {
 				},
 			};
 			await this.$prepareController.prepare(prepareData);
-			const packageFilePath = await deviceDescriptor.buildAction();
+			await deviceDescriptor.buildAction();
 			await this.$deviceInstallAppService.installOnDevice(
 				device,
-				{ ...deviceDescriptor.buildData, buildForDevice: !device.isEmulator },
-				packageFilePath
+				{ ...deviceDescriptor.buildData, buildForDevice: !device.isEmulator }
 			);
 		};
 

diff --git a/lib/controllers/migrate-controller.ts b/lib/controllers/migrate-controller.ts
@@ -67,6 +67,7 @@ export class MigrateController
 		private $pluginsService: IPluginsService,
 		private $projectDataService: IProjectDataService,
 		private $projectConfigService: IProjectConfigService,
+		private $projectData: IProjectData,
 		private $options: IOptions,
 		private $resources: IResourceLoader,
 		private $injector: IInjector,
@@ -721,7 +722,7 @@ export class MigrateController
 	private async cleanUpProject(projectData: IProjectData): Promise<void> {
 		await this.$projectCleanupService.clean([
 			constants.HOOKS_DIR_NAME,
-			constants.PLATFORMS_DIR_NAME,
+			this.$projectData.getBuildRelativeDirectoryPath(),
 			constants.NODE_MODULES_FOLDER_NAME,
 			constants.PACKAGE_LOCK_JSON_FILE_NAME,
 		]);

diff --git a/lib/controllers/platform-controller.ts b/lib/controllers/platform-controller.ts
@@ -68,7 +68,8 @@ export class PlatformController implements IPlatformController {
 			packageToInstall,
 			addPlatformData
 		);
-
+		const buildPath = projectData.platformsDir;
+		console.log('buildPath', buildPath, projectData.getBuildRelativeDirectoryPath())
 		this.$fs.ensureDirectoryExists(
 			path.join(projectData.platformsDir, platform)
 		);
@@ -96,6 +97,7 @@ export class PlatformController implements IPlatformController {
 					commentHeader,
 					`appPath = ${appPath}`,
 					`appResourcesPath = ${appResourcesPath}`,
+					`buildPath = ${buildPath}`,
 					"",
 				].join("\n");
 

diff --git a/lib/controllers/prepare-controller.ts b/lib/controllers/prepare-controller.ts
@@ -289,7 +289,7 @@ export class PrepareController extends EventEmitter {
 					data.platform.toLowerCase() === platformData.platformNameLowerCase
 				) {
 					if (this.isFileWatcherPaused()) return;
-					this.emitPrepareEvent({ ...data, hasNativeChanges: false });
+					this.emitPrepareEvent({ ...data, files: data.files || [], hasNativeChanges: false });
 				}
 			};
 
@@ -371,7 +371,7 @@ export class PrepareController extends EventEmitter {
 					this.$logger.info(`Chokidar raised event ${event} for ${filePath}.`);
 					await this.writeRuntimePackageJson(projectData, platformData);
 					this.emitPrepareEvent({
-						files: [],
+						files: [filePath],
 						staleFiles: [],
 						hasOnlyHotUpdateFiles: false,
 						hmrData: null,

diff --git a/lib/controllers/run-controller.ts b/lib/controllers/run-controller.ts
@@ -12,7 +12,7 @@ import * as util from "util";
 import * as _ from "lodash";
 import { IProjectDataService, IProjectData } from "../definitions/project";
 import { IBuildController } from "../definitions/build";
-import { IPlatformsDataService } from "../definitions/platform";
+import { IPlatformData, IPlatformsDataService } from "../definitions/platform";
 import { IDebugController } from "../definitions/debug";
 import { IPluginsService } from "../definitions/plugins";
 import {
@@ -23,6 +23,7 @@ import {
 } from "../common/declarations";
 import { IInjector } from "../common/definitions/yok";
 import { injector } from "../common/yok";
+import { hook } from "../common/helpers";
 
 export class RunController extends EventEmitter implements IRunController {
 	private prepareReadyEventHandler: any = null;
@@ -95,17 +96,23 @@ export class RunController extends EventEmitter implements IRunController {
 					const changesInfo = await this.$projectChangesService.checkForChanges(
 						platformData,
 						projectData,
-						prepareData
+						prepareData,
+						data
 					);
 					if (changesInfo.hasChanges) {
 						await this.syncChangedDataOnDevices(
 							data,
 							projectData,
+							platformData,
 							liveSyncInfo
 						);
 					}
 				} else {
-					await this.syncChangedDataOnDevices(data, projectData, liveSyncInfo);
+					const platformData = this.$platformsDataService.getPlatformData(
+						data.platform,
+						projectData
+					);
+					await this.syncChangedDataOnDevices(data, projectData, platformData, liveSyncInfo);
 				}
 			};
 
@@ -471,7 +478,6 @@ export class RunController extends EventEmitter implements IRunController {
 		deviceDescriptors: ILiveSyncDeviceDescriptor[]
 	): Promise<void> {
 		const rebuiltInformation: IDictionary<{
-			packageFilePath: string;
 			platform: string;
 			isEmulator: boolean;
 		}> = {};
@@ -508,8 +514,6 @@ export class RunController extends EventEmitter implements IRunController {
 			);
 
 			try {
-				let packageFilePath: string = null;
-
 				// Case where we have three devices attached, a change that requires build is found,
 				// we'll rebuild the app only for the first device, but we should install new package on all three devices.
 				if (
@@ -520,25 +524,20 @@ export class RunController extends EventEmitter implements IRunController {
 						rebuiltInformation[platformData.platformNameLowerCase]
 							.isEmulator === device.isEmulator)
 				) {
-					packageFilePath =
-						rebuiltInformation[platformData.platformNameLowerCase]
-							.packageFilePath;
 					await this.$deviceInstallAppService.installOnDevice(
 						device,
-						buildData,
-						packageFilePath
+						buildData
 					);
 				} else {
 					const shouldBuild =
 						prepareResultData.hasNativeChanges ||
 						buildData.nativePrepare.forceRebuildNativeApp ||
 						(await this.$buildController.shouldBuild(buildData));
 					if (shouldBuild) {
-						packageFilePath = await deviceDescriptor.buildAction();
+						await deviceDescriptor.buildAction();
 						rebuiltInformation[platformData.platformNameLowerCase] = {
 							isEmulator: device.isEmulator,
-							platform: platformData.platformNameLowerCase,
-							packageFilePath,
+							platform: platformData.platformNameLowerCase
 						};
 					} else {
 						await this.$analyticsService.trackEventActionInGoogleAnalytics({
@@ -550,8 +549,7 @@ export class RunController extends EventEmitter implements IRunController {
 
 					await this.$deviceInstallAppService.installOnDeviceIfNeeded(
 						device,
-						buildData,
-						packageFilePath
+						buildData
 					);
 				}
 
@@ -623,9 +621,11 @@ export class RunController extends EventEmitter implements IRunController {
 		);
 	}
 
+	@hook("syncChangedDataOnDevices")
 	private async syncChangedDataOnDevices(
 		data: IFilesChangeEventData,
 		projectData: IProjectData,
+		platformData: IPlatformData,
 		liveSyncInfo: ILiveSyncInfo
 	): Promise<void> {
 		const successfullySyncedMessageFormat = `Successfully synced application %s on device %s.`;
@@ -713,9 +713,7 @@ export class RunController extends EventEmitter implements IRunController {
 
 					await this.$deviceInstallAppService.installOnDevice(
 						device,
-						deviceDescriptor.buildData,
-						rebuiltInformation[platformData.platformNameLowerCase]
-							.packageFilePath
+						deviceDescriptor.buildData
 					);
 					await platformLiveSyncService.syncAfterInstall(device, watchInfo);
 					await this.refreshApplication(

diff --git a/lib/controllers/update-controller.ts b/lib/controllers/update-controller.ts
@@ -296,7 +296,7 @@ export class UpdateController
 	private async cleanUpProject(): Promise<void> {
 		await this.$projectCleanupService.clean([
 			constants.HOOKS_DIR_NAME,
-			constants.PLATFORMS_DIR_NAME,
+			this.$projectDataService.getProjectData().getBuildRelativeDirectoryPath(),
 			constants.NODE_MODULES_FOLDER_NAME,
 			constants.PACKAGE_LOCK_JSON_FILE_NAME,
 		]);

diff --git a/lib/data/build-data.ts b/lib/data/build-data.ts
@@ -6,6 +6,7 @@ export class BuildData extends PrepareData implements IBuildData {
 	public emulator?: boolean;
 	public clean: boolean;
 	public buildForDevice?: boolean;
+	public buildFilterDevicesArch?: boolean;
 	public buildOutputStdio?: string;
 	public outputPath?: string;
 	public copyTo?: string;
@@ -47,6 +48,7 @@ export class AndroidBuildData extends BuildData {
 	public keyStoreAliasPassword: string;
 	public keyStorePassword: string;
 	public androidBundle: boolean;
+	public gradleFlavor: string;
 	public gradlePath: string;
 	public gradleArgs: string;
 
@@ -58,6 +60,8 @@ export class AndroidBuildData extends BuildData {
 		this.keyStoreAliasPassword = data.keyStoreAliasPassword;
 		this.keyStorePassword = data.keyStorePassword;
 		this.androidBundle = data.androidBundle || data.aab;
+		this.buildFilterDevicesArch = !this.androidBundle && data.filterDevicesArch !== false ;
+		this.gradleFlavor = data.flavor;
 		this.gradlePath = data.gradlePath;
 		this.gradleArgs = data.gradleArgs;
 	}

diff --git a/lib/declarations.d.ts b/lib/declarations.d.ts
@@ -579,8 +579,9 @@ interface IAndroidBundleOptions {
 }
 
 interface IAndroidOptions {
+	gradleFlavor: string;
 	gradlePath: string;
-	gradleArgs: string;
+	gradleArgs: string[];
 }
 
 interface ITypingsOptions {

diff --git a/lib/definitions/android-plugin-migrator.d.ts b/lib/definitions/android-plugin-migrator.d.ts
@@ -10,8 +10,8 @@ interface IAndroidBuildOptions {
 	pluginName: string;
 	aarOutputDir: string;
 	tempPluginDirPath: string;
+	gradleArgs?: string[];
 	gradlePath?: string;
-	gradleArgs?: string;
 }
 
 interface IAndroidPluginBuildService {
@@ -48,5 +48,5 @@ interface IBuildAndroidPluginData extends Partial<IProjectDir> {
 	/**
 	 * Optional custom Gradle arguments.
 	 */
-	gradleArgs?: string;
+	 gradleArgs?: string[],
 }