Refactor implementation. Delete unnecessary newly added code fragments.

Author: e2l3n

lib/constants.ts

@@ -5,6 +5,7 @@ export var APP_RESOURCES_FOLDER_NAME = "App_Resources";
 export var PROJECT_FRAMEWORK_FOLDER_NAME = "framework";
 export var NATIVESCRIPT_KEY_NAME = "nativescript";
 export var NODE_MODULES_FOLDER_NAME = "node_modules";
+export var TNS_CORE_MODULES_NAME = "tns-core-modules";
 export var PACKAGE_JSON_FILE_NAME = "package.json";
 export var NODE_MODULE_CACHE_PATH_KEY_NAME = "node-modules-cache-path";
 export var DEFAULT_APP_IDENTIFIER_PREFIX = "org.nativescript";

lib/declarations.ts

@@ -78,7 +78,6 @@ interface IOptions extends ICommonOptions {
 	keyStoreAliasPassword: string;
 	sdk: string;
 	ignoreScripts: boolean;
-	tnsModulesVersion: string;
 }
 
 interface IProjectFilesManager {

lib/definitions/project.d.ts

@@ -1,7 +1,3 @@
-interface ITNSModulesService {
-	tnsModulesInstallationPath(projectRoot: string): IFuture<string>;
-	npmTnsCoreModulesName: string;
-}
 
 interface IProjectService {
 	createProject(projectName: string): IFuture<void>;

lib/options.ts

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

lib/services/platform-service.ts

@@ -178,7 +178,9 @@ export class PlatformService implements IPlatformService {
 			this.$pluginsService.ensureAllDependenciesAreInstalled().wait();
 			let tnsModulesDestinationPath = path.join(platformData.appDestinationDirectoryPath, constants.APP_FOLDER_NAME, PlatformService.TNS_MODULES_FOLDER_NAME);
 			this.$broccoliBuilder.prepareNodeModules(tnsModulesDestinationPath, this.$projectData.projectDir, platform, lastModifiedTime).wait();
-			
+			shell.cp("-Rf", path.join(tnsModulesDestinationPath, constants.TNS_CORE_MODULES_NAME, "*"), tnsModulesDestinationPath);
+			this.$fs.deleteDirectory(constants.TNS_CORE_MODULES_NAME).wait();
+
 			// Process platform specific files
 			let directoryPath = path.join(platformData.appDestinationDirectoryPath, constants.APP_FOLDER_NAME);
 			let excludedDirs = [constants.APP_RESOURCES_FOLDER_NAME];

lib/services/project-service.ts

@@ -10,15 +10,16 @@ import util = require("util");
 
 export class ProjectService implements IProjectService {
 
-	constructor(private $errors: IErrors,
+	constructor(private $npm: INodePackageManager,
+		private $errors: IErrors,
 		private $fs: IFileSystem,
 		private $logger: ILogger,
 		private $projectDataService: IProjectDataService,
 		private $projectHelper: IProjectHelper,
 		private $projectNameValidator: IProjectNameValidator,
 		private $projectTemplatesService: IProjectTemplatesService,
 		private $options: IOptions,
-		private $tnsModulesService: ITNSModulesService) { }
+		private $childProcess: IChildProcess) { }
 
 	public createProject(projectName: string): IFuture<void> {
 		return(() => {
@@ -77,21 +78,8 @@ export class ProjectService implements IProjectService {
 				appPath = defaultTemplatePath;
 			}
 
-            var tnsModulesVersion: string = null;
-            // Optional parameter has a higher priority than defined version in package.json
-            if (this.$options.tnsModulesVersion) {
-                tnsModulesVersion = this.$options.tnsModulesVersion;
-            }
-            else {
-                let coreModulesName = this.$tnsModulesService.npmTnsCoreModulesName;
-                tnsModulesVersion = this.$fs.readJson(path.join(appPath, constants.PACKAGE_JSON_FILE_NAME)).wait()[coreModulesName]["version"];
-            }
-
-            // Download tns-core-modules via npm and get destination file path
-            var tnsModulesResourcePath = this.$tnsModulesService.tnsModulesInstallationPath(tnsModulesVersion).wait();
-
 			try {
-				this.createProjectCore(projectDir, appPath, tnsModulesResourcePath, projectId).wait();
+				this.createProjectCore(projectDir, appPath, projectId).wait();
 			} catch (err) {
 				this.$fs.deleteDirectory(projectDir).wait();
 				throw err;
@@ -102,7 +90,7 @@ export class ProjectService implements IProjectService {
 		}).future<void>()();
 	}
 
-	private createProjectCore(projectDir: string, appSourcePath: string, tnsModulesPath: string, projectId: string): IFuture<void> {
+	private createProjectCore(projectDir: string, appSourcePath: string, projectId: string): IFuture<void> {
 		return (() => {
 			this.$fs.ensureDirectoryExists(projectDir).wait();
 
@@ -114,25 +102,20 @@ export class ProjectService implements IProjectService {
 			} else {
 				shell.cp('-R', path.join(appSourcePath, "*"), appDestinationPath);
 			}
-			
-			// Copy tns-core-modules package to node_modules destination directory
-			let nodeModulesDestination = path.join(appDestinationPath, constants.NODE_MODULES_FOLDER_NAME);
-            this.$fs.ensureDirectoryExists(nodeModulesDestination).wait();
-            shell.cp('-Rf', path.join(tnsModulesPath, '*'), nodeModulesDestination);
-
-            let tnsModulesVersion = this.$fs.readJson(path.join(nodeModulesDestination, constants.PACKAGE_JSON_FILE_NAME)).wait().version;
 
-			this.createBasicProjectStructure(projectDir,  projectId, tnsModulesVersion).wait();
+			this.createBasicProjectStructure(projectDir,  projectId).wait();
 		}).future<void>()();
 	}
 
-	private createBasicProjectStructure(projectDir: string,  projectId: string, tnsModulesVersion: string): IFuture<void> {
+	private createBasicProjectStructure(projectDir: string,  projectId: string): IFuture<void> {
 		return (() => {
 			this.$fs.createDirectory(path.join(projectDir, "platforms")).wait();
 
 			this.$projectDataService.initialize(projectDir);
 			this.$projectDataService.setValue("id", projectId).wait();
-			this.$projectDataService.setValue(this.$tnsModulesService.npmTnsCoreModulesName, { version: tnsModulesVersion }).wait();
+			//Start child process because --save --save-exact option is necessary when installing tns-core-modules
+			//in order to create "dependencies" key in package.json. 
+			this.$childProcess.exec("npm install " + constants.TNS_CORE_MODULES_NAME + " --save --save-exact", { cwd: projectDir }).wait();
 		}).future<void>()();
 	}