diff --git a/lib/services/platform-service.ts b/lib/services/platform-service.ts index c673395bf9..83f8612642 100644 --- a/lib/services/platform-service.ts +++ b/lib/services/platform-service.ts @@ -132,11 +132,7 @@ export class PlatformService implements IPlatformService { platformData.platformProjectService.interpolateData().wait(); platformData.platformProjectService.afterCreateProject(platformData.projectRoot).wait(); - if(this.$options.baseConfig) { - let newConfigFile = path.resolve(this.$options.baseConfig); - this.$logger.trace(`Replacing '${platformData.configurationFilePath}' with '${newConfigFile}'.`); - this.$fs.copyFile(newConfigFile, platformData.configurationFilePath).wait(); - } + this.applyBaseConfigOption(platformData).wait(); let frameworkPackageNameData: any = {version: installedVersion}; if(customTemplateOptions) { @@ -306,6 +302,8 @@ export class PlatformService implements IPlatformService { // Replace placeholders in configuration files platformData.platformProjectService.interpolateConfigurationFile().wait(); + this.applyBaseConfigOption(platformData).wait(); + this.$logger.out("Project successfully prepared"); return true; }).future()(); @@ -684,5 +682,15 @@ export class PlatformService implements IPlatformService { private mapFrameworkFiles(npmCacheDirectoryPath: string, files: string[]): string[] { return _.map(files, file => file.substr(npmCacheDirectoryPath.length + constants.PROJECT_FRAMEWORK_FOLDER_NAME.length + 1)); } + + private applyBaseConfigOption(platformData: IPlatformData): IFuture { + return (() => { + if(this.$options.baseConfig) { + let newConfigFile = path.resolve(this.$options.baseConfig); + this.$logger.trace(`Replacing '${platformData.configurationFilePath}' with '${newConfigFile}'.`); + this.$fs.copyFile(newConfigFile, platformData.configurationFilePath).wait(); + } + }).future()(); + } } $injector.register("platformService", PlatformService);