chore: config and template handling

Author: NathanWalker

lib/constants.ts

@@ -297,15 +297,15 @@ export class SubscribeForNewsletterMessages {
 		":";
 }
 
-export class TemplateVersions {
-	public static v1 = "v1";
-	public static v2 = "v2";
-}
-
-export class ProjectTemplateErrors {
-	public static InvalidTemplateVersionStringFormat =
-		"The template '%s' has a NativeScript version '%s' that is not supported. Unable to create project from it.";
-}
+// export class TemplateVersions {
+// 	public static v1 = "v1";
+// 	public static v2 = "v2";
+// }
+
+// export class ProjectTemplateErrors {
+// 	public static InvalidTemplateVersionStringFormat =
+// 		"The template '%s' has a NativeScript version '%s' that is not supported. Unable to create project from it.";
+// }
 
 export class Hooks {
 	public static createProject = "createProject";

lib/definitions/project.d.ts

@@ -299,11 +299,20 @@ interface IProjectConfigService {
 	 * Get value for a given config key path
 	 * @param key the property key path
 	 */
-  getValue(key: string): any;
-  
-  detectInfo(projectDir?: string): { hasTS: boolean; hasJS: boolean, configJSFilePath: string; configTSFilePath: string };
+	getValue(key: string): any;
 
-  setAppId(projectId: string, projectDir?: string): void;
+	detectInfo(
+		projectDir?: string
+	): {
+		hasTS: boolean;
+		hasJS: boolean;
+		configJSFilePath: string;
+		configTSFilePath: string;
+	};
+
+	getDefaultTSConfig(appId: string): string;
+
+	writeDefaultConfig(projectDir?: string, appId?: string): void;
 }
 
 interface IAssetItem {
@@ -367,14 +376,6 @@ interface ITemplateData {
 	 * In case template is v2, will be null.
 	 */
 	templatePath: string;
-	/**
-	 * The templateVersion property from nativescript section inside package.json file
-	 * "nativescript": {
-			"id": "org.nativescript.app6",
-			"templateVersion": "v2"
-		}
-	 */
-	templateVersion: string;
 	/**
 	 * The whole content of package.json file
 	 */

lib/project-data.ts

@@ -262,7 +262,7 @@ export class ProjectData implements IProjectData {
 			return this.nsConfig[constants.CONFIG_NS_APP_ENTRY];
 		}
 
-		return constants.APP_FOLDER_NAME;
+		return constants.SRC_DIR;
 	}
 
 	public getNsConfigRelativePath(): string {

lib/services/project-config-service.ts

@@ -30,6 +30,19 @@ export class ProjectConfigService implements IProjectConfigService {
 		return this.$injector.resolve("projectHelper");
 	}
 
+	public getDefaultTSConfig(appId: string = "org.nativescript.app") {
+		return `import { NativeScriptConfig } from '@nativescript/core';
+
+export default {
+  id: '${appId}',
+  appResourcesPath: 'App_Resources',
+  android: {
+    v8Flags: '--expose_gc',
+    markingMode: 'none'
+  }
+} as NativeScriptConfig;`.trim();
+	}
+
 	public detectInfo(
 		projectDir?: string
 	): {
@@ -104,20 +117,13 @@ export class ProjectConfigService implements IProjectConfigService {
 		return _.get(this.readConfig(), key);
 	}
 
-  // TODO: improve to set any value
-	// public setValue(projectDir?: string) {
-	public setAppId(projectId: string, projectDir?: string) {
-		const { hasTS, configJSFilePath, configTSFilePath } = this.detectInfo(
-			projectDir
+	public writeDefaultConfig(projectDir: string, appId?: string) {
+		const configTSFilePath = path.join(
+			projectDir || this.projectHelper.projectDir,
+			CONFIG_FILE_NAME_TS
 		);
 
-		const configPath = hasTS ? configTSFilePath : configJSFilePath;
-
-		const rawSource = this.$fs.readText(configPath);
-		this.$fs.writeFile(
-			configPath,
-			rawSource.replace(`org.nativescript.app`, projectId)
-		);
+		this.$fs.writeFile(configTSFilePath, this.getDefaultTSConfig(appId));
 	}
 }