chore: remove ConfigBase and StaticConfigBase classes

Remove ConfigBase and StaticConfigBase classes to simplify the usage of both `$staticConfig` and `$config` - we do not need the base classes - just move the implementation to the current inheritors

Author: rosen-vladimirov

lib/common/appbuilder/declarations.d.ts

@@ -106,13 +106,6 @@ declare module Project {
 		 * @type {Project.IProjectInformation}
 		 */
 		projectInformation: Project.IProjectInformation;
-
-		/**
-		 * Gets the app identifier which is going to be used to build the application.
-		 * @parameter Optional parameter the platform for which the app identifier will be returned.
-		 * @return {string} the app identifier which will be used to build the application.
-		 */
-		getAppIdentifierForPlatform(platform?: string): string;
 	}
 
 	/**

lib/common/appbuilder/project/project-base.ts

@@ -1,13 +1,10 @@
 import { EOL } from "os";
 import * as path from "path";
 import { TARGET_FRAMEWORK_IDENTIFIERS } from "../../constants";
-import { cache } from "../../decorators";
 
 export abstract class ProjectBase implements Project.IProjectBase {
 	private static VALID_CONFIGURATION_CHARACTERS_REGEX = "[-_A-Za-z0-9]";
 	private static CONFIGURATION_FROM_FILE_NAME_REGEX = new RegExp(`^[.](${ProjectBase.VALID_CONFIGURATION_CHARACTERS_REGEX}+?)[.]abproject$`, "i");
-	private static ANDROID_MANIFEST_NAME = "AndroidManifest.xml";
-	private static APP_IDENTIFIER_PLACEHOLDER = "$AppIdentifier$";
 
 	public configurationSpecificData: IDictionary<Project.IData>;
 
@@ -76,26 +73,6 @@ export abstract class ProjectBase implements Project.IProjectBase {
 		};
 	}
 
-	@cache()
-	public getAppIdentifierForPlatform(platform?: string): string {
-		let platformSpecificAppIdentifier = this.projectData.AppIdentifier;
-
-		if (platform &&
-			platform.toLowerCase() === this.$projectConstants.ANDROID_PLATFORM_NAME.toLowerCase() &&
-			this.projectData.Framework === TARGET_FRAMEWORK_IDENTIFIERS.Cordova) {
-			const pathToAndroidResources = path.join(this.projectDir, this.$staticConfig.APP_RESOURCES_DIR_NAME, this.$projectConstants.ANDROID_PLATFORM_NAME);
-
-			const pathToAndroidManifest = path.join(pathToAndroidResources, ProjectBase.ANDROID_MANIFEST_NAME);
-			const appIdentifierInAndroidManifest = this.getAppIdentifierFromConfigFile(pathToAndroidManifest, /package\s*=\s*"(\S*)"/);
-
-			if (appIdentifierInAndroidManifest && appIdentifierInAndroidManifest !== ProjectBase.APP_IDENTIFIER_PLACEHOLDER) {
-				platformSpecificAppIdentifier = appIdentifierInAndroidManifest;
-			}
-		}
-
-		return platformSpecificAppIdentifier;
-	}
-
 	protected abstract validate(): void;
 	protected abstract saveProjectIfNeeded(): void;
 
@@ -152,18 +129,4 @@ export abstract class ProjectBase implements Project.IProjectBase {
 
 		return data;
 	}
-
-	private getAppIdentifierFromConfigFile(pathToConfigFile: string, regExp: RegExp): string {
-		if (this.$fs.exists(pathToConfigFile)) {
-			const fileContent = this.$fs.readText(pathToConfigFile);
-
-			const matches = fileContent.match(regExp);
-
-			if (matches && matches[1]) {
-				return matches[1];
-			}
-		}
-
-		return null;
-	}
 }

lib/common/appbuilder/proton-bootstrap.ts

@@ -1,7 +1,6 @@
 require("./appbuilder-bootstrap");
 $injector.require("messages", "./messages/messages");
 
-$injector.require("staticConfig", "./appbuilder/proton-static-config");
 $injector.register("config", {});
 // Proton will track the features and exceptions, so no need of analyticsService here.
 $injector.register("analyiticsService", {});

lib/common/appbuilder/proton-static-config.ts

@@ -66,7 +66,7 @@ export class ProtonLiveSyncService implements IProtonLiveSyncService {
 			}
 		}
 
-		const appIdentifier = await this.$project.getAppIdentifierForPlatform(this.$devicesService.platform),
+		const appIdentifier = "",
 			canExecute = (d: Mobile.IDevice) => d.deviceInfo.identifier === device.deviceInfo.identifier,
 			livesyncData: ILiveSyncData = {
 				platform: device.deviceInfo.platform,

lib/common/appbuilder/services/livesync/livesync-service.ts

@@ -1404,13 +1404,6 @@ interface IResourceLoader {
 	 * @return {any}      Object based on the JSON contents of the resource file.
 	 */
 	readJson(path: string): any;
-
-	/**
-	 * Returns the path to App_Resources folder, which contains all resources for a given application.
-	 * @param  {string} framework The application's framework name
-	 * @return {string}           The absolute path to App_Resources folder
-	 */
-	getPathToAppResources(framework: string): string;
 }
 
 interface IPluginVariablesHelper {

lib/common/config-base.ts

@@ -20,7 +20,6 @@ declare module Config {
 		HTML_COMMON_HELPERS_DIR: string;
 		HTML_CLI_HELPERS_DIR: string;
 		pathToPackageJson: string;
-		APP_RESOURCES_DIR_NAME: string;
 		RESOURCE_DIR_PATH: string;
 		PATH_TO_BOOTSTRAP: string;
 		QR_SIZE: number;
@@ -30,9 +29,7 @@ declare module Config {
 
 	interface IConfig {
 		DEBUG?: boolean;
-		ON_PREM?: boolean;
 		CI_LOGGER?: boolean;
-		TYPESCRIPT_COMPILER_OPTIONS?: ITypeScriptCompilerOptions;
 		DISABLE_HOOKS: boolean;
 	}
 }

lib/common/declarations.d.ts

@@ -19,9 +19,5 @@ export class ResourceLoader implements IResourceLoader {
 	readJson(resourcePath: string): any {
 		return this.$fs.readJson(this.resolvePath(resourcePath));
 	}
-
-	public getPathToAppResources(framework: string): string {
-		return path.join(this.resolvePath(framework), this.$staticConfig.APP_RESOURCES_DIR_NAME);
-	}
 }
 $injector.register("resources", ResourceLoader);