chore: Ensure App_Resources are copied correctly from default template

In case the used template does not have App_Resources, we need to copy them from the default template.
Ensure the location of the App_Resources in the default template is calculated correctly based on its templateVersion property.

Author: rosen-vladimirov

lib/definitions/project.d.ts

@@ -219,6 +219,14 @@ interface IProjectTemplatesService {
 	 * @return {ITemplateData} Data describing the template - location where it is installed and its NativeScript version.
 	 */
 	prepareTemplate(templateName: string, projectDir: string): Promise<ITemplateData>;
+
+	/**
+	 * Gives information for the nativescript specific version of the template, for example v1, v2, etc.
+	 * Defaults to v1 in case there's no version specified.
+	 * @param {string} templatePath Full path to the template.
+	 * @returns {string} The version, for example v1 or v2.
+	 */
+	getTemplateVersion(templatePath: string): string;
 }
 
 interface IPlatformProjectServiceBase {

lib/services/project-service.ts

@@ -113,15 +113,15 @@ export class ProjectService implements IProjectService {
 		this.$logger.trace(`Template version is ${templateVersion}`);
 		let destinationDir = "";
 		switch (templateVersion) {
-			case constants.TemplateVersions.v2:
-				destinationDir = projectDir;
-				break;
 			case constants.TemplateVersions.v1:
-			default:
 				const appDestinationPath = this.$projectData.getAppDirectoryPath(projectDir);
 				this.$fs.createDirectory(appDestinationPath);
 				destinationDir = appDestinationPath;
 				break;
+			case constants.TemplateVersions.v2:
+			default:
+				destinationDir = projectDir;
+				break;
 		}
 
 		this.$logger.trace(`Copying application from '${realTemplatePath}' into '${destinationDir}'.`);
@@ -146,20 +146,25 @@ export class ProjectService implements IProjectService {
 				ignoreScripts: false
 			});
 
-			const obsoleteAppResourcesPath = path.join(projectDir,
-				constants.NODE_MODULES_FOLDER_NAME,
-				defaultTemplateName,
-				constants.APP_RESOURCES_FOLDER_NAME);
-
-			const defaultTemplateAppResourcesPath = path.join(projectDir,
-				constants.NODE_MODULES_FOLDER_NAME,
-				defaultTemplateName,
-				constants.APP_FOLDER_NAME,
-				constants.APP_RESOURCES_FOLDER_NAME);
+			const defaultTemplatePath = path.join(projectDir, constants.NODE_MODULES_FOLDER_NAME, defaultTemplateName);
+			const defaultTemplateVersion = this.$projectTemplatesService.getTemplateVersion(defaultTemplatePath);
+
+			let defaultTemplateAppResourcesPath: string = null;
+			switch (defaultTemplateVersion) {
+				case constants.TemplateVersions.v1:
+					defaultTemplateAppResourcesPath = path.join(projectDir,
+						constants.NODE_MODULES_FOLDER_NAME,
+						defaultTemplateName,
+						constants.APP_RESOURCES_FOLDER_NAME);
+					break;
+				case constants.TemplateVersions.v2:
+				default:
+					const defaultTemplateProjectData = this.$projectDataService.getProjectData(defaultTemplatePath);
+					defaultTemplateAppResourcesPath = defaultTemplateProjectData.appResourcesDirectoryPath;
+			}
 
-			const pathToAppResources = this.$fs.exists(defaultTemplateAppResourcesPath) ? defaultTemplateAppResourcesPath : obsoleteAppResourcesPath;
-			if (this.$fs.exists(pathToAppResources)) {
-				shelljs.cp('-R', pathToAppResources, appPath);
+			if (defaultTemplateAppResourcesPath && this.$fs.exists(defaultTemplateAppResourcesPath)) {
+				shelljs.cp('-R', defaultTemplateAppResourcesPath, appPath);
 			}
 
 			await this.$npm.uninstall(defaultTemplateName, { save: true }, projectDir);

lib/services/project-templates-service.ts

@@ -45,7 +45,7 @@ export class ProjectTemplatesService implements IProjectTemplatesService {
 		return { templatePath, templateVersion };
 	}
 
-	private getTemplateVersion(templatePath: string): string {
+	public getTemplateVersion(templatePath: string): string {
 		this.$logger.trace(`Checking the NativeScript version of the template located at ${templatePath}.`);
 		const pathToPackageJson = path.join(templatePath, constants.PACKAGE_JSON_FILE_NAME);
 		if (this.$fs.exists(pathToPackageJson)) {