Merge pull request #4521 from NativeScript/fatme/plugin-variables

chore: delete plugin variables service

Author: Fatme

lib/common/declarations.d.ts

@@ -1242,11 +1242,6 @@ interface IResourceLoader {
 	readJson(path: string): any;
 }
 
-interface IPluginVariablesHelper {
-	getPluginVariableFromVarOption(variableName: string, configuration?: string): any;
-	simplifyYargsObject(obj: any, configuration?: string): any;
-}
-
 /**
  * Used for getting strings for informational/error messages.
  */

lib/common/plugin-variables-helper.ts

@@ -44,53 +44,6 @@ interface IPluginPlatformsData {
 	android: string;
 }
 
-interface IPluginVariablesService {
-	/**
-	 * Saves plugin variables in project package.json file.
-	 * @param  {IPluginData}		pluginData for the plugin.
-	 * @param {string} projectDir: Specifies the directory of the project.
-	 * @return {Promise<void>}
-	 */
-	savePluginVariablesInProjectFile(pluginData: IPluginData, projectDir: string): Promise<void>;
-
-	/**
-	 * Removes plugin variables from project package.json file.
-	 * @param  {string}		pluginName Name of the plugin.
-	 * @param {string} projectDir: Specifies the directory of the project.
-	 * @return {void}
-	 */
-	removePluginVariablesFromProjectFile(pluginName: string, projectDir: string): void;
-
-	/**
-	 * Replaces all plugin variables with their corresponding values.
-	 * @param {IPluginData}		pluginData for the plugin.
-	 * @param {pluginConfigurationFilePath}		pluginConfigurationFilePath for the plugin.
-	 * @param {string} projectDir: Specifies the directory of the project.
-	 * @return {Promise<void>}
-	 */
-	interpolatePluginVariables(pluginData: IPluginData, pluginConfigurationFilePath: string, projectDir: string): Promise<void>;
-
-	/**
-	 * Replaces {nativescript.id} expression with the application identifier from package.json.
-	 * @param {pluginConfigurationFilePath}	pluginConfigurationFilePath for the plugin.
-	 * @return {void}
-	 */
-	interpolateAppIdentifier(pluginConfigurationFilePath: string, projectIdentifier: string): void;
-
-	/**
-	 * Replaces both plugin variables and appIdentifier
-	 */
-	interpolate(pluginData: IPluginData, pluginConfigurationFilePath: string, projectDir: string, projectIdentifier: string): Promise<void>;
-
-	/**
-	 * Returns the
-	 * @param {string}		pluginName for the plugin.
-	 * @return {Promise<string>}		returns the changed plugin configuration file content.
-	 */
-	getPluginVariablePropertyName(pluginName: string): string;
-
-}
-
 interface IPluginVariableData {
 	defaultValue?: string;
 	name?: string;

lib/definitions/plugins.d.ts

@@ -43,7 +43,6 @@ export class IOSProjectService extends projectServiceBaseLib.PlatformProjectServ
 		private $devicesService: Mobile.IDevicesService,
 		private $mobileHelper: Mobile.IMobileHelper,
 		private $hostInfo: IHostInfo,
-		private $pluginVariablesService: IPluginVariablesService,
 		private $xcprojService: IXcprojService,
 		private $iOSProvisionService: IOSProvisionService,
 		private $pbxprojDomXcode: IPbxprojDomXcode,
@@ -800,11 +799,6 @@ We will now place an empty obsolete compatability white screen LauncScreen.xib f
 		await this.mergeInfoPlists(projectData, opts);
 		await this.$iOSEntitlementsService.merge(projectData);
 		await this.mergeProjectXcconfigFiles(projectData, opts);
-		for (const pluginData of await this.getAllInstalledPlugins(projectData)) {
-			await this.$pluginVariablesService.interpolatePluginVariables(pluginData, this.getPlatformData(projectData).configurationFilePath, projectData.projectDir);
-		}
-
-		this.$pluginVariablesService.interpolateAppIdentifier(this.getPlatformData(projectData).configurationFilePath, projectData.projectIdentifiers.ios);
 	}
 
 	private getInfoPlistPath(projectData: IProjectData): string {

lib/services/ios-project-service.ts

@@ -12,9 +12,6 @@ export class PluginsService implements IPluginsService {
 	private get $platformsData(): IPlatformsData {
 		return this.$injector.resolve("platformsData");
 	}
-	private get $pluginVariablesService(): IPluginVariablesService {
-		return this.$injector.resolve("pluginVariablesService");
-	}
 	private get $projectDataService(): IProjectDataService {
 		return this.$injector.resolve("projectDataService");
 	}
@@ -57,16 +54,6 @@ export class PluginsService implements IPluginsService {
 
 			await this.executeForAllInstalledPlatforms(action, projectData);
 
-			try {
-				await this.$pluginVariablesService.savePluginVariablesInProjectFile(pluginData, projectData.projectDir);
-			} catch (err) {
-				// Revert package.json
-				this.$projectDataService.removeNSProperty(projectData.projectDir, this.$pluginVariablesService.getPluginVariablePropertyName(pluginData.name));
-				await this.$packageManager.uninstall(plugin, PluginsService.NPM_CONFIG, projectData.projectDir);
-
-				throw err;
-			}
-
 			this.$logger.out(`Successfully installed plugin ${realNpmPackageJson.name}.`);
 		} else {
 			await this.$packageManager.uninstall(realNpmPackageJson.name, { save: true }, projectData.projectDir);
@@ -81,7 +68,6 @@ export class PluginsService implements IPluginsService {
 			await platformData.platformProjectService.removePluginNativeCode(pluginData, projectData);
 		};
 
-		this.$pluginVariablesService.removePluginVariablesFromProjectFile(pluginName.toLowerCase(), projectData.projectDir);
 		await this.executeForAllInstalledPlatforms(removePluginNativeCodeAction, projectData);
 
 		await this.executeNpmCommand(PluginsService.UNINSTALL_COMMAND_NAME, pluginName, projectData);

lib/services/plugin-variables-service.ts

@@ -21,8 +21,6 @@ import { LoggingLevels } from "../lib/common/mobile/logging-levels";
 import { DeviceDiscovery } from "../lib/common/mobile/mobile-core/device-discovery";
 import { IOSDeviceDiscovery } from "../lib/common/mobile/mobile-core/ios-device-discovery";
 import { AndroidDeviceDiscovery } from "../lib/common/mobile/mobile-core/android-device-discovery";
-import { PluginVariablesService } from "../lib/services/plugin-variables-service";
-import { PluginVariablesHelper } from "../lib/common/plugin-variables-helper";
 import { Utils } from "../lib/common/utils";
 import { CocoaPodsService } from "../lib/services/cocoapods-service";
 import { PackageManager } from "../lib/package-manager";
@@ -113,8 +111,6 @@ function createTestInjector(projectPath: string, projectName: string, xCode?: IX
 		checkIfXcodeprojIsRequired: () => ({})
 	});
 	testInjector.register("iosDeviceOperations", {});
-	testInjector.register("pluginVariablesService", PluginVariablesService);
-	testInjector.register("pluginVariablesHelper", PluginVariablesHelper);
 	testInjector.register("pluginsService", {
 		getAllInstalledPlugins: (): string[] => []
 	});