refactor: the CLI builds aar files if necessary even with no --syncAllFiles flag

Author: Plamen5kov

lib/services/android-project-service.ts

@@ -436,7 +436,7 @@ export class AndroidProjectService extends projectServiceBaseLib.PlatformProject
 					tempPluginDirPath: path.join(projectData.platformsDir, "tempPlugin")
 				};
 
-				this.prebuildNativePlugin(options);
+				await this.prebuildNativePlugin(options);
 			}
 		}
 

lib/services/livesync/livesync-service.ts

@@ -2,9 +2,9 @@ import * as path from "path";
 import * as choki from "chokidar";
 import { EOL } from "os";
 import { EventEmitter } from "events";
-import { hook, executeActionByChunks, isBuildFromCLI } from "../../common/helpers";
+import { hook, isBuildFromCLI } from "../../common/helpers";
 import { PACKAGE_JSON_FILE_NAME, LiveSyncTrackActionNames, USER_INTERACTION_NEEDED_EVENT_NAME, DEBUGGER_ATTACHED_EVENT_NAME, DEBUGGER_DETACHED_EVENT_NAME, TrackActionNames } from "../../constants";
-import { DEFAULT_CHUNK_SIZE, DeviceTypes, DeviceDiscoveryEventNames } from "../../common/constants";
+import { DeviceTypes, DeviceDiscoveryEventNames } from "../../common/constants";
 import { cache } from "../../common/decorators";
 
 const deviceDescriptorPrimaryKey = "identifier";
@@ -37,8 +37,7 @@ export class LiveSyncService extends EventEmitter implements IDebugLiveSyncServi
 		private $debugDataService: IDebugDataService,
 		private $analyticsService: IAnalyticsService,
 		private $usbLiveSyncService: DeprecatedUsbLiveSyncService,
-		private $injector: IInjector,
-		private $platformsData: IPlatformsData) {
+		private $injector: IInjector) {
 		super();
 	}
 
@@ -463,26 +462,6 @@ export class LiveSyncService extends EventEmitter implements IDebugLiveSyncServi
 				const platform = device.deviceInfo.platform;
 				const deviceBuildInfoDescriptor = _.find(deviceDescriptors, dd => dd.identifier === device.deviceInfo.identifier);
 
-				if (liveSyncData.watchAllFiles) {
-					const platformData: IPlatformData = this.$platformsData.getPlatformData("android", projectData);
-					const pluginsNeedingRebuild: Array<any> = await platformData.platformProjectService.checkIfPluginsNeedBuild(projectData);
-					const action = async (buildAarOptions: IBuildOptions) => {
-						this.$logger.warn(`Building ${buildAarOptions.pluginName}...`);
-						await platformData.platformProjectService.prebuildNativePlugin(buildAarOptions);
-					};
-					const pluginInfo: any = [];
-					pluginsNeedingRebuild.forEach((item) => {
-						const options: IBuildOptions = {
-							pluginName: item.pluginName,
-							platformsAndroidDirPath: item.platformsAndroidDirPath,
-							aarOutputDir: item.platformsAndroidDirPath,
-							tempPluginDirPath: path.join(projectData.platformsDir, 'tempPlugin')
-						};
-						pluginInfo.push(options);
-					});
-					await executeActionByChunks<IBuildOptions>(pluginInfo, DEFAULT_CHUNK_SIZE, action);
-				}
-
 				await this.ensureLatestAppPackageIsInstalledOnDevice({
 					device,
 					preparedPlatforms,
@@ -582,37 +561,7 @@ export class LiveSyncService extends EventEmitter implements IDebugLiveSyncServi
 								filesToRemove = [];
 
 								const allModifiedFiles = [].concat(currentFilesToSync).concat(currentFilesToRemove);
-								if (liveSyncData.watchAllFiles) {
-
-									const platformData: IPlatformData = this.$platformsData.getPlatformData("android", projectData);
-									const pluginInfo: any = [];
-									allModifiedFiles.forEach(async (item) => {
-										const matchedItem = item.match(/(.*\/node_modules\/[\w-]+)\/platforms\/android\//);
-										if (matchedItem) {
-											const matchLength = matchedItem[0].length;
-											const matchIndex = item.indexOf(matchedItem[0]);
-											const pluginInputOutputPath = item.substr(0, matchIndex + matchLength);
-											const pluginPackageJason = require(path.resolve(matchedItem[1], PACKAGE_JSON_FILE_NAME));
-
-											if (pluginPackageJason && pluginPackageJason.name) {
-												const options: IBuildOptions = {
-													pluginName: pluginPackageJason.name,
-													platformsAndroidDirPath: pluginInputOutputPath,
-													aarOutputDir: pluginInputOutputPath,
-													tempPluginDirPath: path.join(projectData.platformsDir, "tempPlugin")
-												};
-												pluginInfo.push(options);
-											}
-										}
-									});
-
-									const action = async (buildAarOptions: IBuildOptions) => {
-										this.$logger.warn(`Building ${buildAarOptions.pluginName}...`);
-										await platformData.platformProjectService.prebuildNativePlugin(buildAarOptions);
-									};
 
-									await executeActionByChunks<IBuildOptions>(pluginInfo, DEFAULT_CHUNK_SIZE, action);
-								}
 								const preparedPlatforms: string[] = [];
 								const rebuiltInformation: ILiveSyncBuildInfo[] = [];
 

lib/services/platform-service.ts

@@ -191,7 +191,7 @@ export class PlatformService extends EventEmitter implements IPlatformService {
 		const platformData = this.$platformsData.getPlatformData(platformInfo.platform, platformInfo.projectData);
 
 		const changesInfo = await this.initialPrepare(platformInfo.platform, platformData, platformInfo.appFilesUpdaterOptions, platformInfo.platformTemplate, platformInfo.projectData, platformInfo.config, platformInfo.nativePrepare, platformInfo);
-		const requiresNativePrepare = (!platformInfo.nativePrepare || !platformInfo.nativePrepare.skipNativePrepare) && changesInfo.nativePlatformStatus === constants.NativePlatformStatus.requiresPrepare;
+		const requiresNativePrepare = changesInfo.nativeChanged || (!platformInfo.nativePrepare || !platformInfo.nativePrepare.skipNativePrepare) && changesInfo.nativePlatformStatus === constants.NativePlatformStatus.requiresPrepare;
 
 		if (changesInfo.hasChanges || requiresNativePrepare) {
 			// Always clear up the app directory in platforms if `--bundle` value has changed in between builds or is passed in general
@@ -297,6 +297,7 @@ export class PlatformService extends EventEmitter implements IPlatformService {
 				platformSpecificData,
 				changesInfo,
 				filesToSync,
+				filesToRemove,
 				projectFilesConfig,
 				env
 			});

lib/services/project-changes-service.ts

@@ -64,7 +64,7 @@ export class ProjectChangesService implements IProjectChangesService {
 			this._changesInfo.packageChanged = this.isProjectFileChanged(projectData, platform);
 			this._changesInfo.appResourcesChanged = this.containsNewerFiles(projectData.appResourcesDirectoryPath, null, projectData);
 			/*done because currently all node_modules are traversed, a possible improvement could be traversing only the production dependencies*/
-			this._changesInfo.nativeChanged = projectChangesOptions.skipModulesNativeCheck ? false : this.containsNewerFiles(
+			this._changesInfo.nativeChanged = this.containsNewerFiles(
 				path.join(projectData.projectDir, NODE_MODULES_FOLDER_NAME),
 				path.join(projectData.projectDir, NODE_MODULES_FOLDER_NAME, "tns-ios-inspector"),
 				projectData,

lib/tools/node-modules/node-modules-dest-copy.ts

@@ -140,7 +140,7 @@ export class NpmPluginPrepare {
 	}
 
 	public async preparePlugins(dependencies: IDependencyData[], platform: string, projectData: IProjectData, projectFilesConfig: IProjectFilesConfig): Promise<void> {
-		if (_.isEmpty(dependencies) || this.allPrepared(dependencies, platform, projectData)) {
+		if (_.isEmpty(dependencies)) {
 			return;
 		}
 

test/services/livesync-service.ts

@@ -75,8 +75,7 @@ class LiveSyncServiceInheritor extends LiveSyncService {
 			$debugDataService,
 			$analyticsService,
 			$usbLiveSyncService,
-			$injector,
-			$platformsData
+			$injector
 		);
 	}