chore: cleanup (mostly formatting)

Author: rigor789

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/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/controllers/build-controller.ts

@@ -165,9 +165,8 @@ export class BuildController extends EventEmitter implements IBuildController {
 			return true;
 		}
 
-		const validBuildOutputData = platformData.getValidBuildOutputData(
-			buildData
-		);
+		const validBuildOutputData =
+			platformData.getValidBuildOutputData(buildData);
 		const packages = this.$buildArtifactsService.getAllAppPackages(
 			outputPath,
 			validBuildOutputData
@@ -176,9 +175,8 @@ export class BuildController extends EventEmitter implements IBuildController {
 			return true;
 		}
 
-		const prepareInfo = this.$projectChangesService.getPrepareInfo(
-			platformData
-		);
+		const prepareInfo =
+			this.$projectChangesService.getPrepareInfo(platformData);
 		const buildInfo = this.$buildInfoFileService.getLocalBuildInfo(
 			platformData,
 			buildData

lib/controllers/deploy-controller.ts

@@ -24,10 +24,10 @@ export class DeployController {
 			};
 			await this.$prepareController.prepare(prepareData);
 			await deviceDescriptor.buildAction();
-			await this.$deviceInstallAppService.installOnDevice(
-				device,
-				{ ...deviceDescriptor.buildData, buildForDevice: !device.isEmulator }
-			);
+			await this.$deviceInstallAppService.installOnDevice(device, {
+				...deviceDescriptor.buildData,
+				buildForDevice: !device.isEmulator,
+			});
 		};
 
 		await this.$devicesService.execute(

lib/controllers/platform-controller.ts

@@ -62,16 +62,15 @@ export class PlatformController implements IPlatformController {
 
 		this.$logger.trace("Determined package to install is", packageToInstall);
 
-		const installedPlatformVersion = await this.$addPlatformService.addPlatformSafe(
-			projectData,
-			platformData,
-			packageToInstall,
-			addPlatformData
-		);
+		const installedPlatformVersion =
+			await this.$addPlatformService.addPlatformSafe(
+				projectData,
+				platformData,
+				packageToInstall,
+				addPlatformData
+			);
 		const buildPath = projectData.platformsDir;
-		this.$fs.ensureDirectoryExists(
-			path.join(projectData.platformsDir, platform)
-		);
+		this.$fs.ensureDirectoryExists(path.join(buildPath, platform));
 
 		if (this.$mobileHelper.isAndroidPlatform(platform)) {
 			const gradlePropertiesPath = path.resolve(
@@ -80,7 +79,8 @@ export class PlatformController implements IPlatformController {
 			);
 			const commentHeader = "# App configuration";
 			const appPath = projectData.getAppDirectoryRelativePath();
-			const appResourcesPath = projectData.getAppResourcesRelativeDirectoryPath();
+			const appResourcesPath =
+				projectData.getAppResourcesRelativeDirectoryPath();
 
 			let gradlePropertiesContents = "";
 			if (this.$fs.exists(gradlePropertiesPath)) {
@@ -162,9 +162,10 @@ export class PlatformController implements IPlatformController {
 
 			if (!desiredRuntimePackage.version) {
 				// if no version is explicitly added, then we use the latest
-				desiredRuntimePackage.version = await this.$packageInstallationManager.getLatestCompatibleVersion(
-					desiredRuntimePackage.name
-				);
+				desiredRuntimePackage.version =
+					await this.$packageInstallationManager.getLatestCompatibleVersion(
+						desiredRuntimePackage.name
+					);
 			}
 			// const currentPlatformData = this.$projectDataService.getNSValue(projectData.projectDir, platformData.frameworkPackageName);
 			// version = (currentPlatformData && currentPlatformData.version) ||
@@ -187,9 +188,8 @@ export class PlatformController implements IPlatformController {
 
 		const shouldAddNativePlatform =
 			!nativePrepare || !nativePrepare.skipNativePrepare;
-		const prepareInfo = this.$projectChangesService.getPrepareInfo(
-			platformData
-		);
+		const prepareInfo =
+			this.$projectChangesService.getPrepareInfo(platformData);
 		const requiresNativePlatformAdd =
 			prepareInfo &&
 			prepareInfo.nativePlatformStatus ===

lib/controllers/prepare-controller.ts

@@ -289,7 +289,11 @@ export class PrepareController extends EventEmitter {
 					data.platform.toLowerCase() === platformData.platformNameLowerCase
 				) {
 					if (this.isFileWatcherPaused()) return;
-					this.emitPrepareEvent({ ...data, files: data.files ?? [], hasNativeChanges: false });
+					this.emitPrepareEvent({
+						...data,
+						files: data.files ?? [],
+						hasNativeChanges: false,
+					});
 				}
 			};
 

lib/controllers/run-controller.ts

@@ -112,7 +112,12 @@ export class RunController extends EventEmitter implements IRunController {
 						data.platform,
 						projectData
 					);
-					await this.syncChangedDataOnDevices(data, projectData, platformData, liveSyncInfo);
+					await this.syncChangedDataOnDevices(
+						data,
+						projectData,
+						platformData,
+						liveSyncInfo
+					);
 				}
 			};
 
@@ -537,7 +542,7 @@ export class RunController extends EventEmitter implements IRunController {
 						await deviceDescriptor.buildAction();
 						rebuiltInformation[platformData.platformNameLowerCase] = {
 							isEmulator: device.isEmulator,
-							platform: platformData.platformNameLowerCase
+							platform: platformData.platformNameLowerCase,
 						};
 					} else {
 						await this.$analyticsService.trackEventActionInGoogleAnalytics({

lib/declarations.d.ts

@@ -579,9 +579,9 @@ interface IAndroidBundleOptions {
 }
 
 interface IAndroidOptions {
+	gradleArgs: string[];
 	gradleFlavor: string;
 	gradlePath: string;
-	gradleArgs: string[];
 }
 
 interface ITypingsOptions {

lib/definitions/android-plugin-migrator.d.ts

@@ -48,5 +48,5 @@ interface IBuildAndroidPluginData extends Partial<IProjectDir> {
 	/**
 	 * Optional custom Gradle arguments.
 	 */
-	 gradleArgs?: string[],
+	gradleArgs?: string[];
 }

lib/definitions/build.d.ts

@@ -31,9 +31,9 @@ interface IAndroidBuildData
 		IAndroidSigningData,
 		IHasAndroidBundle {
 	buildFilterDevicesArch?: boolean;
-	gradlePath?: string;
-	gradleFlavor?: string;
 	gradleArgs?: string[];
+	gradleFlavor?: string;
+	gradlePath?: string;
 }
 
 interface IAndroidSigningData {

lib/options.ts

@@ -219,9 +219,13 @@ export class Options {
 				default: false,
 				hasSensitiveValue: false,
 			},
+			gradleArgs: {
+				type: OptionType.String,
+				hasSensitiveValue: false,
+				array: true,
+			},
 			gradleFlavor: { type: OptionType.String, hasSensitiveValue: false },
 			gradlePath: { type: OptionType.String, hasSensitiveValue: false },
-			gradleArgs: { type: OptionType.String, hasSensitiveValue: false, array: true },
 			aab: { type: OptionType.Boolean, hasSensitiveValue: false },
 			filterDevicesArch: { type: OptionType.Boolean, hasSensitiveValue: false },
 			performance: { type: OptionType.Object, hasSensitiveValue: true },
@@ -424,9 +428,8 @@ export class Options {
 		this.$settingsService.setSettings({
 			profileDir: <string>this.argv.profileDir,
 		});
-		this.argv.profileDir = this.argv[
-			"profile-dir"
-		] = this.$settingsService.getProfileDir();
+		this.argv.profileDir = this.argv["profile-dir"] =
+			this.$settingsService.getProfileDir();
 
 		// if justlaunch is set, it takes precedence over the --watch flag and the default true value
 		if (this.argv.justlaunch) {

lib/project-data.ts

@@ -165,7 +165,10 @@ export class ProjectData implements IProjectData {
 				path.basename(projectDir)
 			);
 			this.nsConfig = nsConfig;
-			this.platformsDir = path.join(projectDir, this.getBuildRelativeDirectoryPath());
+			this.platformsDir = path.join(
+				projectDir,
+				this.getBuildRelativeDirectoryPath()
+			);
 			this.projectFilePath = projectFilePath;
 			this.projectIdentifiers = this.initializeProjectIdentifiers(nsConfig);
 			this.packageJsonData = packageJsonData;
@@ -217,11 +220,10 @@ export class ProjectData implements IProjectData {
 			appResourcesDir,
 			this.$devicePlatformsConstants.Android
 		);
-		const androidManifestDir = this.$androidResourcesMigrationService.hasMigrated(
-			appResourcesDir
-		)
-			? path.join(androidDirPath, constants.SRC_DIR, constants.MAIN_DIR)
-			: androidDirPath;
+		const androidManifestDir =
+			this.$androidResourcesMigrationService.hasMigrated(appResourcesDir)
+				? path.join(androidDirPath, constants.SRC_DIR, constants.MAIN_DIR)
+				: androidDirPath;
 
 		return path.join(androidManifestDir, constants.MANIFEST_FILE_NAME);
 	}
@@ -244,7 +246,8 @@ export class ProjectData implements IProjectData {
 	}
 
 	public getAppResourcesDirectoryPath(projectDir?: string): string {
-		const appResourcesRelativePath = this.getAppResourcesRelativeDirectoryPath();
+		const appResourcesRelativePath =
+			this.getAppResourcesRelativeDirectoryPath();
 
 		return this.resolveToProjectDir(appResourcesRelativePath, projectDir);
 	}
@@ -271,10 +274,7 @@ export class ProjectData implements IProjectData {
 	}
 
 	public getBuildRelativeDirectoryPath(): string {
-		if (
-			this.nsConfig &&
-			this.nsConfig[constants.CONFIG_NS_BUILD_ENTRY]
-		) {
+		if (this.nsConfig && this.nsConfig[constants.CONFIG_NS_BUILD_ENTRY]) {
 			return this.nsConfig[constants.CONFIG_NS_BUILD_ENTRY];
 		}
 

lib/services/android-plugin-build-service.ts

@@ -361,7 +361,7 @@ export class AndroidPluginBuildService implements IAndroidPluginBuildService {
 			this.$fs.copyFile(path.join(dir, "*"), destination);
 		}
 	}
-	private extractNamespaceFromManifest(manifestPath:string): string {
+	private extractNamespaceFromManifest(manifestPath: string): string {
 		const fileContent = this.$fs.readText(manifestPath);
 		const contentRegex = new RegExp('package="(.*?)"');
 		const match = fileContent.match(contentRegex);
@@ -394,10 +394,7 @@ export class AndroidPluginBuildService implements IAndroidPluginBuildService {
 		if (this.$projectData.nsConfig.android.gradleVersion) {
 			gradleVersion = this.$projectData.nsConfig.android.gradleVersion;
 		}
-		this.replaceGradleVersion(
-			pluginTempDir,
-			gradleVersion
-		);
+		this.replaceGradleVersion(pluginTempDir, gradleVersion);
 
 		this.replaceGradleAndroidPluginVersion(
 			buildGradlePath,
@@ -407,13 +404,19 @@ export class AndroidPluginBuildService implements IAndroidPluginBuildService {
 		// In gradle 8 every android project must have a namespace in "android"
 		// and the package property in manifest is now forbidden
 		// let s replace it
-		const manifestFilePath = this.getManifest(path.join(pluginTempDir, 'src', 'main'));
+		const manifestFilePath = this.getManifest(
+			path.join(pluginTempDir, "src", "main")
+		);
 		let pluginNamespace = this.extractNamespaceFromManifest(manifestFilePath);
 		if (!pluginNamespace) {
-			pluginNamespace = pluginName.replace(/@/g, '').replace(/[/-]/g, '.')
+			pluginNamespace = pluginName.replace(/@/g, "").replace(/[/-]/g, ".");
 		}
 
-		this.replaceFileContent(buildGradlePath, "{{pluginNamespace}}", pluginNamespace);
+		this.replaceFileContent(
+			buildGradlePath,
+			"{{pluginNamespace}}",
+			pluginNamespace
+		);
 		this.replaceFileContent(buildGradlePath, "{{pluginName}}", pluginName);
 		this.replaceFileContent(settingsGradlePath, "{{pluginName}}", pluginName);
 	}
@@ -779,9 +782,11 @@ export class AndroidPluginBuildService implements IAndroidPluginBuildService {
 			`-PappResourcesPath=${this.$projectData.getAppResourcesDirectoryPath()}`,
 		];
 		if (pluginBuildSettings.gradleArgs) {
-			const additionalArgs: string[] = []
-			pluginBuildSettings.gradleArgs.forEach(arg=>{
-				additionalArgs.push(...arg.split(' -P').map((a,i) => i === 0 ? a : `-P${a}`));
+			const additionalArgs: string[] = [];
+			pluginBuildSettings.gradleArgs.forEach((arg) => {
+				additionalArgs.push(
+					...arg.split(" -P").map((a, i) => (i === 0 ? a : `-P${a}`))
+				);
 			});
 			localArgs.push(...additionalArgs);
 		}