Fix coding style. Add optional parameter tnsModulesVersion.

Author: e2l3n

lib/declarations.ts

@@ -6,7 +6,7 @@ interface INodePackageManager {
 	cache(packageName: string, version: string, cache?: any): IFuture<IDependencyData>;
 	cacheUnpack(packageName: string, version: string, unpackTarget?: string): IFuture<void>;
 	view(packageName: string, propertyName: string): IFuture<any>;
-	executeNpmCommand(npmCommandName: string, currentWorkingDirectory: string): IFuture<void>;
+	executeNpmCommand(npmCommandName: string, currentWorkingDirectory: string): IFuture<any>;
 }
 
 interface INpmInstallationManager {
@@ -79,6 +79,7 @@ interface IOptions extends ICommonOptions {
 	keyStoreAliasPassword: string;
 	sdk: string;
 	ignoreScripts: boolean;
+	tnsModulesVersion: string;
 }
 
 interface IProjectFilesManager {

lib/node-package-manager.ts

@@ -55,10 +55,10 @@ export class NodePackageManager implements INodePackageManager {
 		return this.loadAndExecute("view", [[packageName, propertyName], [false]]);
 	}
 
-	public executeNpmCommand(npmCommandName: string, currentWorkingDirectory: string): IFuture<void> {
+	public executeNpmCommand(npmCommandName: string, currentWorkingDirectory: string): IFuture<any> {
 		return (() => {
-			 this.$childProcess.exec(npmCommandName, { cwd: currentWorkingDirectory }).wait();
-		}).future<void>()();
+			return this.$childProcess.exec(npmCommandName, { cwd: currentWorkingDirectory }).wait();
+		}).future<any>()();
 	}
 
 	private loadAndExecute(commandName: string, args: any[], opts?: { config?: any, subCommandName?: string }): IFuture<any> {

lib/options.ts

@@ -27,7 +27,8 @@ export class Options extends commonOptionsLibPath.OptionsBase {
 			keyStoreAlias: { type: OptionType.String },
 			keyStoreAliasPassword: { type: OptionType.String },
 			sdk: { type: OptionType.String },
-			ignoreScripts: {type: OptionType.Boolean }
+			ignoreScripts: {type: OptionType.Boolean },
+			tnsModulesVersion: { type: OptionType.String } 
 		},
 		path.join($hostInfo.isWindows ? process.env.LocalAppData : path.join(osenv.home(), ".local/share"), ".nativescript-cli"),
 			$errors, $staticConfig);

lib/services/project-service.ts

@@ -112,7 +112,14 @@ export class ProjectService implements IProjectService {
 
 			this.$projectDataService.initialize(projectDir);
 			this.$projectDataService.setValue("id", projectId).wait();
-			this.$npm.executeNpmCommand("npm install " + constants.TNS_CORE_MODULES_NAME + " --save --save-exact", projectDir).wait();
+			
+			let tnsModulesVersion: string = this.$options.tnsModulesVersion;
+			let packageName: string  = constants.TNS_CORE_MODULES_NAME;
+            if (tnsModulesVersion) {
+            	packageName = packageName.concat("@" + tnsModulesVersion);
+            }
+
+			this.$npm.executeNpmCommand("npm install " + packageName + " --save --save-exact", projectDir).wait();
 		}).future<void>()();
 	}
 

lib/tools/broccoli/node-modules-dest-copy.ts

@@ -76,9 +76,10 @@ export class DestCopy implements IBroccoliPlugin {
 			this.$pluginsService.prepare(dependency).wait();
 		}
 
-		if (dependency.name == constants.TNS_CORE_MODULES_NAME) {
-			shelljs.cp("-Rf", path.join(this.outputRoot, constants.TNS_CORE_MODULES_NAME, "*"), this.outputRoot);
-			this.$fs.deleteDirectory(path.join(this.outputRoot, constants.TNS_CORE_MODULES_NAME)).wait();
+		if (dependency.name === constants.TNS_CORE_MODULES_NAME) {
+			let tnsCoreModulesResourcePath = path.join(this.outputRoot, constants.TNS_CORE_MODULES_NAME);
+			shelljs.cp("-Rf", path.join(tnsCoreModulesResourcePath, "*"), this.outputRoot);
+			this.$fs.deleteDirectory(tnsCoreModulesResourcePath).wait();
 		} 
 	});
   }