Merge pull request #1091 from NativeScript/fatme/still-fixing-npm-cache

Still fixing npm cache unpack when framework option is specified

Author: Fatme

lib/npm-installation-manager.ts

@@ -151,17 +151,16 @@ export class NpmInstallationManager implements INpmInstallationManager {
 	private installCore(packageName: string, pathToSave: string, version: string): IFuture<string> {
 		return (() => {
 			if (this.$options.frameworkPath) {
-				if (this.$fs.getFsStats(this.$options.frameworkPath).wait().isFile()) {
-					this.npmInstall(packageName, pathToSave, version).wait();
-					let pathToNodeModules = path.join(pathToSave, "node_modules");
-					let folders = this.$fs.readDirectory(pathToNodeModules).wait();
+				this.npmInstall(packageName, pathToSave, version).wait();
+				let pathToNodeModules = path.join(pathToSave, "node_modules");
+				let folders = this.$fs.readDirectory(pathToNodeModules).wait();
 
-					let data = this.$fs.readJson(path.join(pathToNodeModules, folders[0], "package.json")).wait();
-					this.addToCache(data.name, data.version).wait();
-
-					return path.join(pathToNodeModules, folders[0]);
+				let data = this.$fs.readJson(path.join(pathToNodeModules, folders[0], "package.json")).wait();
+				if(!this.isPackageUnpacked(this.getCachedPackagePath(data.name, data.version), data.name).wait()) {
+					this.cacheUnpack(data.name, data.version).wait();
 				}
-				return this.$options.frameworkPath;
+
+				return path.join(pathToNodeModules, folders[0]);
 			} else {
 				version = version || this.getLatestCompatibleVersion(packageName).wait();
 				let packagePath = this.getCachedPackagePath(packageName, version);

lib/services/platform-service.ts

@@ -96,7 +96,7 @@ export class PlatformService implements IPlatformService {
 			let installedVersion = this.$fs.readJson(path.join(frameworkDir, "../", "package.json")).wait().version;
 			platformData.platformProjectService.createProject(frameworkDir, installedVersion).wait();
 
-			if(this.$options.frameworkPath && this.$fs.getFsStats(this.$options.frameworkPath).wait().isFile() && !this.$options.symlink) {
+			if(this.$options.frameworkPath && !this.$options.symlink) {
 				// Need to remove unneeded node_modules folder
 				// One level up is the runtime module and one above is the node_modules folder.
 				this.$fs.deleteDirectory(path.join(frameworkDir, "../../")).wait();