PR comments

Author: Fatme

lib/constants.ts

@@ -116,6 +116,7 @@ export const VERSION_STRING = "version";
 export const INSPECTOR_CACHE_DIRNAME = "ios-inspector";
 export const POST_INSTALL_COMMAND_NAME = "post-install-cli";
 export const ANDROID_RELEASE_BUILD_ERROR_MESSAGE = "When producing a release build, you need to specify all --key-store-* options.";
+export const CACACHE_DIRECTORY_NAME = "_cacache";
 
 export class DebugCommandErrors {
 	public static UNABLE_TO_USE_FOR_DEVICE_AND_EMULATOR = "The options --for-device and --emulator cannot be used simultaneously. Please use only one of them.";

lib/definitions/pacote-service.d.ts

@@ -15,7 +15,7 @@ declare global {
 		 * @param packageName The name of the package
 		 * @param destinationDirectory The path to directory where the downloaded tarball will be extracted.
 		 */
-		downloadAndExtract(packageName: string, destinationDirectory: string, options?: IPacoteExtractOptions): Promise<void>;
+		extractPackage(packageName: string, destinationDirectory: string, options?: IPacoteExtractOptions): Promise<void>;
 	}
 
 	interface IPacoteBaseOptions {
@@ -32,8 +32,6 @@ declare global {
 		fullMetadata?: boolean;
 	}
 
-	interface IPacoteTarballStreamOptions extends IPacoteBaseOptions { }
-
 	interface IPacoteExtractOptions {
 		filter?: (path: string, stat: tar.FileStat) => boolean;
 	}

lib/definitions/pacote.d.ts

@@ -5,7 +5,7 @@ declare module "pacote" {
 	export var tarball: IPacoteTarballResult;
 
 	interface IPacoteTarballResult {
-		stream: (packageName: string, options: IPacoteTarballStreamOptions) => IPacoteTarballStreamResult;
+		stream: (packageName: string, options: IPacoteBaseOptions) => IPacoteTarballStreamResult;
 		toFile: (packageName: string) => IPacoteTarballFileResult;
 	}
 

lib/definitions/project.d.ts

@@ -239,9 +239,7 @@ interface ITemplateData {
 	templatePackageJsonContent: ITemplatePackageJsonContent;
 }
 
-interface ITemplatePackageJsonContent {
-	name: string;
-	version: string;
+interface ITemplatePackageJsonContent extends IBasePluginData {
 	dependencies: IStringDictionary;
 	devDependencies: IStringDictionary;
 	nativescript?: {

lib/node-package-manager.ts

@@ -1,6 +1,7 @@
 import * as path from "path";
 import { exported, cache } from "./common/decorators";
 import { isInteractive } from "./common/helpers";
+import { CACACHE_DIRECTORY_NAME } from "./constants";
 
 export class NodePackageManager implements INodePackageManager {
 	private static SCOPED_DEPENDENCY_REGEXP = /^(@.+?)(?:@(.+?))?$/;
@@ -131,7 +132,7 @@ export class NodePackageManager implements INodePackageManager {
 	@cache()
 	public async getCachePath(): Promise<string> {
 		const cachePath = await this.$childProcess.exec(`npm config get cache`);
-		return path.join(cachePath.trim(), "_cacache");
+		return path.join(cachePath.trim(), CACACHE_DIRECTORY_NAME);
 	}
 
 	private getNpmExecutableName(): string {

lib/services/pacote-service.ts

@@ -14,7 +14,9 @@ export class PacoteService implements IPacoteService {
 		return pacote.manifest(packageName, manifestOptions);
 	}
 
-	public async downloadAndExtract(packageName: string, destinationDirectory: string, options?: IPacoteExtractOptions): Promise<void> {
+	public async extractPackage(packageName: string, destinationDirectory: string, options?: IPacoteExtractOptions): Promise<void> {
+		// strip: Remove the specified number of leading path elements. Pathnames with fewer elements will be silently skipped. More info: https://github.com/npm/node-tar/blob/e89c4d37519b1c20133a9f49d5f6b85fa34c203b/README.md
+		// C: Create an archive
 		const extractOptions = { strip: 1, C: destinationDirectory };
 		if (options) {
 			_.extend(extractOptions, options);

lib/services/project-service.ts

@@ -67,7 +67,7 @@ export class ProjectService implements IProjectService {
 			await this.ensureAppResourcesExist(projectDir);
 
 			if (!(templatePackageJsonContent && templatePackageJsonContent.dependencies && templatePackageJsonContent.dependencies[constants.TNS_CORE_MODULES_NAME])) {
-				await this.$npmInstallationManager.install(constants.TNS_CORE_MODULES_NAME, projectDir, { dependencyType: "save" });
+				await this.addTnsCoreModules(projectDir);
 			}
 
 			if (templateVersion === constants.TemplateVersions.v1) {
@@ -123,7 +123,7 @@ export class ProjectService implements IProjectService {
 				this.$fs.createDirectory(path.join(projectDir, "platforms"));
 				break;
 			case constants.TemplateVersions.v2:
-				await this.$pacoteService.downloadAndExtract(templateData.templateName, projectDir);
+				await this.$pacoteService.extractPackage(templateData.templateName, projectDir);
 				break;
 			default:
 				this.$errors.failWithoutHelp(format(constants.ProjectTemplateErrors.InvalidTemplateVersionStringFormat, templateData.templateName, templateData.templateVersion));
@@ -140,7 +140,7 @@ export class ProjectService implements IProjectService {
 			this.$fs.createDirectory(appResourcesDestinationPath);
 
 			// the template installed doesn't have App_Resources -> get from a default template
-			await this.$pacoteService.downloadAndExtract(constants.RESERVED_TEMPLATE_NAMES["default"], appPath, { filter: (name: string, entry: any) => entry.path.indexOf(constants.APP_RESOURCES_FOLDER_NAME) !== -1 });
+			await this.$pacoteService.extractPackage(constants.RESERVED_TEMPLATE_NAMES["default"], appPath, { filter: (name: string, entry: any) => entry.path.indexOf(constants.APP_RESOURCES_FOLDER_NAME) !== -1 });
 		}
 	}
 
@@ -228,5 +228,15 @@ export class ProjectService implements IProjectService {
 	private setAppId(projectDir: string, projectId: string): void {
 		this.$projectDataService.setNSValue(projectDir, "id", projectId);
 	}
+
+	private async addTnsCoreModules(projectDir: string): Promise<void> {
+		const projectFilePath = path.join(projectDir, this.$staticConfig.PROJECT_FILE_NAME);
+		const packageJsonData = this.$fs.readJson(projectFilePath);
+
+		const version = await this.$npmInstallationManager.getLatestCompatibleVersion(constants.TNS_CORE_MODULES_NAME);
+		packageJsonData.dependencies[constants.TNS_CORE_MODULES_NAME] = version;
+
+		this.$fs.writeJson(projectFilePath, packageJsonData);
+	}
 }
 $injector.register("projectService", ProjectService);

npm-shrinkwrap.json

@@ -30,7 +30,6 @@
     "mobile"
   ],
   "dependencies": {
-    "@types/tar": "4.0.0",
     "byline": "4.2.1",
     "chalk": "1.1.0",
     "chokidar": "1.7.0",
@@ -97,6 +96,7 @@
     "@types/semver": "^5.3.31",
     "@types/sinon": "4.0.0",
     "@types/source-map": "0.5.0",
+    "@types/tar": "4.0.0",
     "@types/universal-analytics": "0.4.1",
     "@types/ws": "4.0.1",
     "@types/xml2js": "^0.4.2",