Merge pull request #4419 from NativeScript/fatme/skipCopy

fix: remove the logic for skipCopyTnsModules and skipCopyAppResourcesFiles

Author: Fatme

lib/definitions/platform.d.ts

@@ -350,10 +350,7 @@ interface IOptionalFilesToRemove {
 	filesToRemove?: string[];
 }
 
-interface IPreparePlatformInfoBase extends IPlatform, IAppFilesUpdaterOptionsComposition, IProjectDataComposition, IEnvOptions, IOptionalFilesToSync, IOptionalFilesToRemove, IOptionalNativePrepareComposition {
-	skipCopyTnsModules?: boolean;
-	skipCopyAppResourcesFiles?: boolean;
-}
+interface IPreparePlatformInfoBase extends IPlatform, IAppFilesUpdaterOptionsComposition, IProjectDataComposition, IEnvOptions, IOptionalFilesToSync, IOptionalFilesToRemove, IOptionalNativePrepareComposition { }
 
 interface IOptionalNativePrepareComposition {
 	nativePrepare?: INativePrepare;

lib/services/platform-service.ts

@@ -249,9 +249,7 @@ export class PlatformService extends EventEmitter implements IPlatformService {
 				changesInfo,
 				platformInfo.filesToSync,
 				platformInfo.filesToRemove,
-				platformInfo.nativePrepare,
-				platformInfo.skipCopyAppResourcesFiles,
-				platformInfo.skipCopyTnsModules
+				platformInfo.nativePrepare
 			);
 			this.$projectChangesService.savePrepareInfo(platformInfo.platform, platformInfo.projectData);
 		} else {
@@ -320,9 +318,7 @@ export class PlatformService extends EventEmitter implements IPlatformService {
 		changesInfo?: IProjectChangesInfo,
 		filesToSync?: string[],
 		filesToRemove?: string[],
-		nativePrepare?: INativePrepare,
-		skipCopyAppResourcesFiles?: boolean,
-		skipCopyTnsModules?: boolean): Promise<void> {
+		nativePrepare?: INativePrepare): Promise<void> {
 
 		this.$logger.out("Preparing project...");
 
@@ -338,9 +334,7 @@ export class PlatformService extends EventEmitter implements IPlatformService {
 			changesInfo,
 			filesToSync,
 			filesToRemove,
-			env,
-			skipCopyAppResourcesFiles,
-			skipCopyTnsModules
+			env
 		});
 
 		if (!nativePrepare || !nativePrepare.skipNativePrepare) {

lib/services/prepare-platform-js-service.ts

@@ -38,12 +38,6 @@ export class PreparePlatformJSService extends PreparePlatformService implements
 	public async preparePlatform(config: IPreparePlatformJSInfo): Promise<void> {
 		if (!config.changesInfo || config.changesInfo.appFilesChanged || config.changesInfo.changesRequirePrepare) {
 			await this.copyAppFiles(config);
-			if (!config.skipCopyAppResourcesFiles) {
-				this.copyAppResourcesFiles(config);
-			}
-		}
-
-		if (!config.skipCopyAppResourcesFiles && !this.$fs.exists(path.join(config.platformData.appDestinationDirectoryPath, constants.APP_FOLDER_NAME, constants.APP_RESOURCES_FOLDER_NAME))) {
 			this.copyAppResourcesFiles(config);
 		}
 
@@ -57,12 +51,6 @@ export class PreparePlatformJSService extends PreparePlatformService implements
 		}
 
 		if (!config.changesInfo || config.changesInfo.modulesChanged) {
-			if (!config.skipCopyTnsModules) {
-				await this.copyTnsModules(config.platform, config.platformData, config.projectData, config.appFilesUpdaterOptions, config.projectFilesConfig);
-			}
-		}
-
-		if (!config.skipCopyTnsModules && !this.$fs.exists(path.join(config.platformData.appDestinationDirectoryPath, constants.APP_FOLDER_NAME, constants.TNS_MODULES_FOLDER_NAME, constants.TNS_CORE_MODULES_NAME))) {
 			await this.copyTnsModules(config.platform, config.platformData, config.projectData, config.appFilesUpdaterOptions, config.projectFilesConfig);
 		}
 	}