chore: remove platformTemplate logic

Fatme · Fatme · commit 60548665d66f · 2019-04-10T13:15:47.000+03:00
diff --git a/lib/commands/add-platform.ts b/lib/commands/add-platform.ts
@@ -13,7 +13,7 @@ export class AddPlatformCommand extends ValidatePlatformCommandBase implements I
 	}
 
 	public async execute(args: string[]): Promise<void> {
-		await this.$platformService.addPlatforms(args, this.$options.platformTemplate, this.$projectData, this.$options, this.$options.frameworkPath);
+		await this.$platformService.addPlatforms(args, this.$projectData, this.$options, this.$options.frameworkPath);
 	}
 
 	public async canExecute(args: string[]): Promise<ICanExecuteCommandOutput> {
diff --git a/lib/commands/appstore-upload.ts b/lib/commands/appstore-upload.ts
@@ -64,7 +64,6 @@ export class PublishIOS implements ICommand {
 			const platformInfo: IPreparePlatformInfo = {
 				platform,
 				appFilesUpdaterOptions,
-				platformTemplate: this.$options.platformTemplate,
 				projectData: this.$projectData,
 				config: this.$options,
 				env: this.$options.env
diff --git a/lib/commands/build.ts b/lib/commands/build.ts
@@ -24,7 +24,6 @@ export abstract class BuildCommandBase extends ValidatePlatformCommandBase {
 		const platformInfo: IPreparePlatformInfo = {
 			platform,
 			appFilesUpdaterOptions,
-			platformTemplate: this.$options.platformTemplate,
 			projectData: this.$projectData,
 			config: this.$options,
 			env: this.$options.env
diff --git a/lib/commands/clean-app.ts b/lib/commands/clean-app.ts
@@ -25,7 +25,6 @@ export class CleanAppCommandBase extends ValidatePlatformCommandBase implements
 			appFilesUpdaterOptions,
 			platform: this.platform.toLowerCase(),
 			config: this.$options,
-			platformTemplate: this.$options.platformTemplate,
 			projectData: this.$projectData,
 			env: this.$options.env
 		};
diff --git a/lib/commands/install.ts b/lib/commands/install.ts
@@ -34,7 +34,7 @@ export class InstallCommand implements ICommand {
 					const platformProjectService = platformData.platformProjectService;
 					await platformProjectService.validate(this.$projectData, this.$options);
 
-					await this.$platformService.addPlatforms([`${platform}@${frameworkPackageData.version}`], this.$options.platformTemplate, this.$projectData, this.$options, this.$options.frameworkPath);
+					await this.$platformService.addPlatforms([`${platform}@${frameworkPackageData.version}`], this.$projectData, this.$options, this.$options.frameworkPath);
 				} catch (err) {
 					error = `${error}${EOL}${err}`;
 				}
diff --git a/lib/commands/platform-clean.ts b/lib/commands/platform-clean.ts
@@ -10,7 +10,7 @@ export class CleanCommand implements ICommand {
 	}
 
 	public async execute(args: string[]): Promise<void> {
-		await this.$platformService.cleanPlatforms(args, this.$options.platformTemplate, this.$projectData, this.$options);
+		await this.$platformService.cleanPlatforms(args, this.$projectData, this.$options);
 	}
 
 	public async canExecute(args: string[]): Promise<boolean> {
diff --git a/lib/commands/prepare.ts b/lib/commands/prepare.ts
@@ -21,7 +21,6 @@ export class PrepareCommand extends ValidatePlatformCommandBase implements IComm
 		const platformInfo: IPreparePlatformInfo = {
 			platform: args[0],
 			appFilesUpdaterOptions,
-			platformTemplate: this.$options.platformTemplate,
 			projectData: this.$projectData,
 			config: this.$options,
 			env: this.$options.env
diff --git a/lib/commands/update-platform.ts b/lib/commands/update-platform.ts
@@ -10,7 +10,7 @@ export class UpdatePlatformCommand implements ICommand {
 	}
 
 	public async execute(args: string[]): Promise<void> {
-		await this.$platformService.updatePlatforms(args, this.$options.platformTemplate, this.$projectData, this.$options);
+		await this.$platformService.updatePlatforms(args, this.$projectData, this.$options);
 	}
 
 	public async canExecute(args: string[]): Promise<boolean> {
diff --git a/lib/commands/update.ts b/lib/commands/update.ts
@@ -94,12 +94,12 @@ export class UpdateCommand extends ValidatePlatformCommandBase implements IComma
 
 		if (args.length === 1) {
 			for (const platform of platforms.packagePlatforms) {
-				await this.$platformService.addPlatforms([platform + "@" + args[0]], this.$options.platformTemplate, this.$projectData, this.$options, this.$options.frameworkPath);
+				await this.$platformService.addPlatforms([platform + "@" + args[0]], this.$projectData, this.$options, this.$options.frameworkPath);
 			}
 
 			await this.$pluginsService.add(`${constants.TNS_CORE_MODULES_NAME}@${args[0]}`, this.$projectData);
 		} else {
-			await this.$platformService.addPlatforms(platforms.packagePlatforms, this.$options.platformTemplate, this.$projectData, this.$options, this.$options.frameworkPath);
+			await this.$platformService.addPlatforms(platforms.packagePlatforms, this.$projectData, this.$options, this.$options.frameworkPath);
 			await this.$pluginsService.add(constants.TNS_CORE_MODULES_NAME, this.$projectData);
 		}
 
diff --git a/lib/declarations.d.ts b/lib/declarations.d.ts
@@ -441,11 +441,6 @@ interface IBundleString {
 	bundle: string;
 }
 
-interface IPlatformTemplate {
-	platformTemplate: string;
-}
-
-
 interface IClean {
 	clean: boolean;
 }
@@ -499,7 +494,7 @@ interface IAndroidBundleOptions {
 	aab: boolean;
 }
 
-interface IOptions extends IRelease, IDeviceIdentifier, IJustLaunch, IAvd, IAvailableDevices, IProfileDir, IHasEmulatorOption, IBundleString, IPlatformTemplate, IHasEmulatorOption, IClean, IProvision, ITeamIdentifier, IAndroidReleaseOptions, IAndroidBundleOptions, INpmInstallConfigurationOptions, IPort, IEnvOptions, IPluginSeedOptions, IGenerateOptions {
+interface IOptions extends IRelease, IDeviceIdentifier, IJustLaunch, IAvd, IAvailableDevices, IProfileDir, IHasEmulatorOption, IBundleString, IHasEmulatorOption, IClean, IProvision, ITeamIdentifier, IAndroidReleaseOptions, IAndroidBundleOptions, INpmInstallConfigurationOptions, IPort, IEnvOptions, IPluginSeedOptions, IGenerateOptions {
 	argv: IYargArgv;
 	validateOptions(commandSpecificDashedOptions?: IDictionary<IDashedOption>): void;
 	options: IDictionary<IDashedOption>;
@@ -589,11 +584,11 @@ interface IDeviceEmulator extends IHasEmulatorOption, IDeviceIdentifier { }
 
 interface IRunPlatformOptions extends IJustLaunch, IDeviceEmulator { }
 
-interface IDeployPlatformOptions extends IAndroidReleaseOptions, IPlatformTemplate, IRelease, IClean, IDeviceEmulator, IProvision, ITeamIdentifier, IProjectDir {
+interface IDeployPlatformOptions extends IAndroidReleaseOptions, IRelease, IClean, IDeviceEmulator, IProvision, ITeamIdentifier, IProjectDir {
 	forceInstall?: boolean;
 }
 
-interface IUpdatePlatformOptions extends IPlatformTemplate {
+interface IUpdatePlatformOptions {
 	currentVersion: string;
 	newVersion: string;
 	canUpdate: boolean;
diff --git a/lib/definitions/platform.d.ts b/lib/definitions/platform.d.ts
@@ -15,9 +15,9 @@ interface IBuildPlatformAction {
 }
 
 interface IPlatformService extends IBuildPlatformAction, NodeJS.EventEmitter {
-	cleanPlatforms(platforms: string[], platformTemplate: string, projectData: IProjectData, config: IPlatformOptions, framework?: string): Promise<void>;
+	cleanPlatforms(platforms: string[], projectData: IProjectData, config: IPlatformOptions, framework?: string): Promise<void>;
 
-	addPlatforms(platforms: string[], platformTemplate: string, projectData: IProjectData, config: IPlatformOptions, frameworkPath?: string): Promise<void>;
+	addPlatforms(platforms: string[], projectData: IProjectData, config: IPlatformOptions, frameworkPath?: string): Promise<void>;
 
 	/**
 	 * Gets list of all installed platforms (the ones for which <project dir>/platforms/<platform> exists).
@@ -48,7 +48,7 @@ interface IPlatformService extends IBuildPlatformAction, NodeJS.EventEmitter {
 	 */
 	removePlatforms(platforms: string[], projectData: IProjectData): Promise<void>;
 
-	updatePlatforms(platforms: string[], platformTemplate: string, projectData: IProjectData, config: IPlatformOptions): Promise<void>;
+	updatePlatforms(platforms: string[], projectData: IProjectData, config: IPlatformOptions): Promise<void>;
 
 	/**
 	 * Ensures that the specified platform and its dependencies are installed.
@@ -316,7 +316,6 @@ interface IAddPlatformInfo extends IProjectDataComposition, IPlatformDataComposi
 	frameworkDir: string;
 	installedVersion: string;
 	config: IPlatformOptions;
-	platformTemplate?: string;
 }
 
 interface IPreparePlatformJSInfo extends IPreparePlatformCoreInfo, ICopyAppFilesData {
@@ -335,7 +334,7 @@ interface IPreparePlatformCoreInfo extends IPreparePlatformInfoBase, IOptionalPr
 	platformSpecificData: IPlatformSpecificData;
 }
 
-interface IPreparePlatformInfo extends IPreparePlatformInfoBase, IPlatformConfig, IPlatformTemplate, ISkipNativeCheckOptional { }
+interface IPreparePlatformInfo extends IPreparePlatformInfoBase, IPlatformConfig, ISkipNativeCheckOptional { }
 
 interface IPlatformConfig {
 	config: IPlatformOptions;
diff --git a/lib/definitions/project.d.ts b/lib/definitions/project.d.ts
@@ -336,10 +336,9 @@ interface ILocalBuildService {
 	 * Builds a project locally.
 	 * @param {string} platform Platform for which to build.
 	 * @param {IPlatformBuildData} platformBuildOptions Additional options for controlling the build.
-	 * @param {string} platformTemplate The name of the template.
 	 * @return {Promise<string>} Path to the build output.
 	 */
-	build(platform: string, platformBuildOptions: IPlatformBuildData, platformTemplate?: string): Promise<string>;
+	build(platform: string, platformBuildOptions: IPlatformBuildData): Promise<string>;
 	/**
 	 * Removes build artifacts specific to the platform
 	 * @param {ICleanNativeAppData} data Data describing the clean app process
diff --git a/lib/helpers/deploy-command-helper.ts b/lib/helpers/deploy-command-helper.ts
@@ -17,7 +17,6 @@ export class DeployCommandHelper implements IDeployCommandHelper {
 			device: this.$options.device,
 			projectDir: this.$projectData.projectDir,
 			emulator: this.$options.emulator,
-			platformTemplate: this.$options.platformTemplate,
 			release: this.$options.release,
 			forceInstall: true,
 			provision: this.$options.provision,
diff --git a/lib/options.ts b/lib/options.ts
@@ -90,7 +90,6 @@ export class Options {
 			compileSdk: { type: OptionType.Number, hasSensitiveValue: false },
 			port: { type: OptionType.Number, hasSensitiveValue: false },
 			copyTo: { type: OptionType.String, hasSensitiveValue: true },
-			platformTemplate: { type: OptionType.String, hasSensitiveValue: true },
 			js: { type: OptionType.Boolean, hasSensitiveValue: false },
 			javascript: { type: OptionType.Boolean, hasSensitiveValue: false },
 			ng: { type: OptionType.Boolean, hasSensitiveValue: false },
diff --git a/lib/services/livesync/livesync-service.ts b/lib/services/livesync/livesync-service.ts
@@ -429,7 +429,6 @@ export class LiveSyncService extends EventEmitter implements IDebugLiveSyncServi
 				nativePrepare: nativePrepare,
 				filesToSync: options.filesToSync,
 				filesToRemove: options.filesToRemove,
-				platformTemplate: null,
 				skipModulesNativeCheck: options.skipModulesNativeCheck,
 				config: platformSpecificOptions
 			};
diff --git a/lib/services/local-build-service.ts b/lib/services/local-build-service.ts
@@ -12,7 +12,7 @@ export class LocalBuildService extends EventEmitter implements ILocalBuildServic
 		super();
 	}
 
-	public async build(platform: string, platformBuildOptions: IPlatformBuildData, platformTemplate?: string): Promise<string> {
+	public async build(platform: string, platformBuildOptions: IPlatformBuildData): Promise<string> {
 		if (this.$mobileHelper.isAndroidPlatform(platform) && platformBuildOptions.release && (!platformBuildOptions.keyStorePath || !platformBuildOptions.keyStorePassword || !platformBuildOptions.keyStoreAlias || !platformBuildOptions.keyStoreAliasPassword)) {
 			this.$errors.fail(ANDROID_RELEASE_BUILD_ERROR_MESSAGE);
 		}
@@ -21,7 +21,6 @@ export class LocalBuildService extends EventEmitter implements ILocalBuildServic
 		const prepareInfo: IPreparePlatformInfo = {
 			platform,
 			appFilesUpdaterOptions: platformBuildOptions,
-			platformTemplate,
 			projectData: this.$projectData,
 			env: platformBuildOptions.env,
 			config: {
diff --git a/lib/services/platform-service.ts b/lib/services/platform-service.ts
diff --git a/lib/services/prepare-platform-js-service.ts b/lib/services/prepare-platform-js-service.ts
diff --git a/test/platform-service.ts b/test/platform-service.ts

Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,7 @@ export class AddPlatformCommand extends ValidatePlatformCommandBase implements I`
`13`	`13`	`}`
`14`	`14`
`15`	`15`	`public async execute(args: string[]): Promise<void> {`
`16`		`- await this.$platformService.addPlatforms(args, this.$options.platformTemplate, this.$projectData, this.$options, this.$options.frameworkPath);`
	`16`	`+ await this.$platformService.addPlatforms(args, this.$projectData, this.$options, this.$options.frameworkPath);`
`17`	`17`	`}`
`18`	`18`
`19`	`19`	`public async canExecute(args: string[]): Promise<ICanExecuteCommandOutput> {`
Original file line number	Diff line number	Diff line change
`@@ -34,7 +34,7 @@ export class InstallCommand implements ICommand {`
`34`	`34`	`const platformProjectService = platformData.platformProjectService;`
`35`	`35`	`await platformProjectService.validate(this.$projectData, this.$options);`
`36`	`36`
`37`		- await this.$platformService.addPlatforms([`${platform}@${frameworkPackageData.version}`], this.$options.platformTemplate, this.$projectData, this.$options, this.$options.frameworkPath);
	`37`	+ await this.$platformService.addPlatforms([`${platform}@${frameworkPackageData.version}`], this.$projectData, this.$options, this.$options.frameworkPath);
`38`	`38`	`} catch (err) {`
`39`	`39`	error = `${error}${EOL}${err}`;
`40`	`40`	`}`
Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@ export class CleanCommand implements ICommand {`
`10`	`10`	`}`
`11`	`11`
`12`	`12`	`public async execute(args: string[]): Promise<void> {`
`13`		`- await this.$platformService.cleanPlatforms(args, this.$options.platformTemplate, this.$projectData, this.$options);`
	`13`	`+ await this.$platformService.cleanPlatforms(args, this.$projectData, this.$options);`
`14`	`14`	`}`
`15`	`15`
`16`	`16`	`public async canExecute(args: string[]): Promise<boolean> {`
Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@ export class UpdatePlatformCommand implements ICommand {`
`10`	`10`	`}`
`11`	`11`
`12`	`12`	`public async execute(args: string[]): Promise<void> {`
`13`		`- await this.$platformService.updatePlatforms(args, this.$options.platformTemplate, this.$projectData, this.$options);`
	`13`	`+ await this.$platformService.updatePlatforms(args, this.$projectData, this.$options);`
`14`	`14`	`}`
`15`	`15`
`16`	`16`	`public async canExecute(args: string[]): Promise<boolean> {`
Original file line number	Diff line number	Diff line change
`@@ -94,12 +94,12 @@ export class UpdateCommand extends ValidatePlatformCommandBase implements IComma`
`94`	`94`
`95`	`95`	`if (args.length === 1) {`
`96`	`96`	`for (const platform of platforms.packagePlatforms) {`
`97`		`- await this.$platformService.addPlatforms([platform + "@" + args[0]], this.$options.platformTemplate, this.$projectData, this.$options, this.$options.frameworkPath);`
	`97`	`+ await this.$platformService.addPlatforms([platform + "@" + args[0]], this.$projectData, this.$options, this.$options.frameworkPath);`
`98`	`98`	`}`
`99`	`99`
`100`	`100`	await this.$pluginsService.add(`${constants.TNS_CORE_MODULES_NAME}@${args[0]}`, this.$projectData);
`101`	`101`	`} else {`
`102`		`- await this.$platformService.addPlatforms(platforms.packagePlatforms, this.$options.platformTemplate, this.$projectData, this.$options, this.$options.frameworkPath);`
	`102`	`+ await this.$platformService.addPlatforms(platforms.packagePlatforms, this.$projectData, this.$options, this.$options.frameworkPath);`
`103`	`103`	`await this.$pluginsService.add(constants.TNS_CORE_MODULES_NAME, this.$projectData);`
`104`	`104`	`}`
`105`	`105`