From 43541b16cba16761c136a46910b36be2ee2df07b Mon Sep 17 00:00:00 2001 From: fatme Date: Wed, 6 Mar 2019 08:14:12 +0200 Subject: [PATCH 1/2] fix: remove skipCopyAppResourcesFiles --- lib/definitions/platform.d.ts | 1 - lib/services/platform-service.ts | 3 --- lib/services/prepare-platform-js-service.ts | 6 ------ 3 files changed, 10 deletions(-) diff --git a/lib/definitions/platform.d.ts b/lib/definitions/platform.d.ts index ac8874cea1..d8b9405662 100644 --- a/lib/definitions/platform.d.ts +++ b/lib/definitions/platform.d.ts @@ -352,7 +352,6 @@ interface IOptionalFilesToRemove { interface IPreparePlatformInfoBase extends IPlatform, IAppFilesUpdaterOptionsComposition, IProjectDataComposition, IEnvOptions, IOptionalFilesToSync, IOptionalFilesToRemove, IOptionalNativePrepareComposition { skipCopyTnsModules?: boolean; - skipCopyAppResourcesFiles?: boolean; } interface IOptionalNativePrepareComposition { diff --git a/lib/services/platform-service.ts b/lib/services/platform-service.ts index 58cf1ea65d..1ae71c9855 100644 --- a/lib/services/platform-service.ts +++ b/lib/services/platform-service.ts @@ -250,7 +250,6 @@ export class PlatformService extends EventEmitter implements IPlatformService { platformInfo.filesToSync, platformInfo.filesToRemove, platformInfo.nativePrepare, - platformInfo.skipCopyAppResourcesFiles, platformInfo.skipCopyTnsModules ); this.$projectChangesService.savePrepareInfo(platformInfo.platform, platformInfo.projectData); @@ -321,7 +320,6 @@ export class PlatformService extends EventEmitter implements IPlatformService { filesToSync?: string[], filesToRemove?: string[], nativePrepare?: INativePrepare, - skipCopyAppResourcesFiles?: boolean, skipCopyTnsModules?: boolean): Promise { this.$logger.out("Preparing project..."); @@ -339,7 +337,6 @@ export class PlatformService extends EventEmitter implements IPlatformService { filesToSync, filesToRemove, env, - skipCopyAppResourcesFiles, skipCopyTnsModules }); diff --git a/lib/services/prepare-platform-js-service.ts b/lib/services/prepare-platform-js-service.ts index e555175d4e..bf4947ecb8 100644 --- a/lib/services/prepare-platform-js-service.ts +++ b/lib/services/prepare-platform-js-service.ts @@ -38,12 +38,6 @@ export class PreparePlatformJSService extends PreparePlatformService implements public async preparePlatform(config: IPreparePlatformJSInfo): Promise { 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); } From a02d552453be98d071f60eecfec743ef3f513520 Mon Sep 17 00:00:00 2001 From: fatme Date: Wed, 6 Mar 2019 08:15:43 +0200 Subject: [PATCH 2/2] fix: remove skipCopyTnsModules --- lib/definitions/platform.d.ts | 4 +--- lib/services/platform-service.ts | 9 +++------ lib/services/prepare-platform-js-service.ts | 6 ------ 3 files changed, 4 insertions(+), 15 deletions(-) diff --git a/lib/definitions/platform.d.ts b/lib/definitions/platform.d.ts index d8b9405662..6a02997efc 100644 --- a/lib/definitions/platform.d.ts +++ b/lib/definitions/platform.d.ts @@ -350,9 +350,7 @@ interface IOptionalFilesToRemove { filesToRemove?: string[]; } -interface IPreparePlatformInfoBase extends IPlatform, IAppFilesUpdaterOptionsComposition, IProjectDataComposition, IEnvOptions, IOptionalFilesToSync, IOptionalFilesToRemove, IOptionalNativePrepareComposition { - skipCopyTnsModules?: boolean; -} +interface IPreparePlatformInfoBase extends IPlatform, IAppFilesUpdaterOptionsComposition, IProjectDataComposition, IEnvOptions, IOptionalFilesToSync, IOptionalFilesToRemove, IOptionalNativePrepareComposition { } interface IOptionalNativePrepareComposition { nativePrepare?: INativePrepare; diff --git a/lib/services/platform-service.ts b/lib/services/platform-service.ts index 1ae71c9855..495671210a 100644 --- a/lib/services/platform-service.ts +++ b/lib/services/platform-service.ts @@ -249,8 +249,7 @@ export class PlatformService extends EventEmitter implements IPlatformService { changesInfo, platformInfo.filesToSync, platformInfo.filesToRemove, - platformInfo.nativePrepare, - platformInfo.skipCopyTnsModules + platformInfo.nativePrepare ); this.$projectChangesService.savePrepareInfo(platformInfo.platform, platformInfo.projectData); } else { @@ -319,8 +318,7 @@ export class PlatformService extends EventEmitter implements IPlatformService { changesInfo?: IProjectChangesInfo, filesToSync?: string[], filesToRemove?: string[], - nativePrepare?: INativePrepare, - skipCopyTnsModules?: boolean): Promise { + nativePrepare?: INativePrepare): Promise { this.$logger.out("Preparing project..."); @@ -336,8 +334,7 @@ export class PlatformService extends EventEmitter implements IPlatformService { changesInfo, filesToSync, filesToRemove, - env, - skipCopyTnsModules + env }); if (!nativePrepare || !nativePrepare.skipNativePrepare) { diff --git a/lib/services/prepare-platform-js-service.ts b/lib/services/prepare-platform-js-service.ts index bf4947ecb8..6b74a4e262 100644 --- a/lib/services/prepare-platform-js-service.ts +++ b/lib/services/prepare-platform-js-service.ts @@ -51,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); } }