Merge pull request #2872 from NativeScript/vladimirov/merge-rel-master

Merge release in master

Author: rosen-vladimirov

CHANGELOG.md

@@ -1,12 +1,26 @@
 NativeScript CLI Changelog
 ================
 
+3.0.3 (2017, June 1)
+==
+
+### Fixed
+
+* [Fix #2855](https://github.com/NativeScript/nativescript-cli/issues/2855): iOS inspector not installed with npm 5
+
+3.0.2 (2017, May 30)
+==
+
+### Fixed
+
+* Removed restart of the App if HTML/CSS file was modified. The issue is fixed in the Modules **3.0.1** and we can again just refresh the app on change.
+* [Fix #2852](https://github.com/NativeScript/nativescript-cli/pull/2852): Fix prepare for android when building with webpack
+
 3.0.1 (2017, May 11)
 ==
 
 ### Fixed
 
-* [Fix #2780](https://github.com/NativeScript/nativescript-cli/issues/2780): CLI tool doesn't restart app if HTML/CSS file was modified
 * [Fix #2732](https://github.com/NativeScript/nativescript-cli/issues/2732): Livesync crashes app every OTHER time on iOS with 3.0.0-rc.2
 * [Fix #2764](https://github.com/NativeScript/nativescript-cli/issues/2764): Error when executing "tns run ios" with 3.0 on a project that is located in a directory path with "spaces"
 

lib/common

@@ -72,3 +72,4 @@ export const TYPESCRIPT_NAME = "typescript";
 export const BUILD_OUTPUT_EVENT_NAME = "buildOutput";
 export const CONNECTION_ERROR_EVENT_NAME = "connectionError";
 export const VERSION_STRING = "version";
+export const INSPECTOR_CACHE_DIRNAME = "ios-inspector";

lib/constants.ts

@@ -47,27 +47,38 @@ export class NpmInstallationManager implements INpmInstallationManager {
 	}
 
 	public async getInspectorFromCache(inspectorNpmPackageName: string, projectDir: string): Promise<string> {
-		let inspectorPath = path.join(projectDir, "node_modules", inspectorNpmPackageName);
+		let inspectorPath = path.join(projectDir, constants.NODE_MODULES_FOLDER_NAME, inspectorNpmPackageName);
 
 		// local installation takes precedence over cache
 		if (!this.inspectorAlreadyInstalled(inspectorPath)) {
-			let cachepath = (await this.$childProcess.exec("npm get cache")).trim();
-			let version = await this.getLatestCompatibleVersion(inspectorNpmPackageName);
-			let pathToPackageInCache = path.join(cachepath, inspectorNpmPackageName, version);
-			let pathToUnzippedInspector = path.join(pathToPackageInCache, "package");
+			const cachePath = path.join(this.$options.profileDir, constants.INSPECTOR_CACHE_DIRNAME);
+			this.prepareCacheDir(cachePath);
+			const pathToPackageInCache = path.join(cachePath, constants.NODE_MODULES_FOLDER_NAME, inspectorNpmPackageName);
 
 			if (!this.$fs.exists(pathToPackageInCache)) {
-				await this.$childProcess.exec(`npm cache add ${inspectorNpmPackageName}@${version}`);
-				let inspectorTgzPathInCache = path.join(pathToPackageInCache, "package.tgz");
-				await this.$childProcess.exec(`tar -xf ${inspectorTgzPathInCache} -C ${pathToPackageInCache}`);
-				await this.$childProcess.exec(`npm install --prefix ${pathToUnzippedInspector}`);
+				const version = await this.getLatestCompatibleVersion(inspectorNpmPackageName);
+				await this.$childProcess.exec(`npm install ${inspectorNpmPackageName}@${version} --prefix ${cachePath}`);
 			}
+
 			this.$logger.out("Using inspector from cache.");
-			return pathToUnzippedInspector;
+			return pathToPackageInCache;
 		}
+
 		return inspectorPath;
 	}
 
+	private prepareCacheDir(cacheDirName: string): void {
+		this.$fs.ensureDirectoryExists(cacheDirName);
+
+		const cacheDirPackageJsonLocation = path.join(cacheDirName, constants.PACKAGE_JSON_FILE_NAME);
+		if (!this.$fs.exists(cacheDirPackageJsonLocation)) {
+			this.$fs.writeJson(cacheDirPackageJsonLocation, {
+				name: constants.INSPECTOR_CACHE_DIRNAME,
+				version: "0.1.0"
+			});
+		}
+	}
+
 	private inspectorAlreadyInstalled(pathToInspector: string): Boolean {
 		if (this.$fs.exists(pathToInspector)) {
 			return true;

lib/npm-installation-manager.ts

@@ -233,15 +233,7 @@ export class PlatformService extends EventEmitter implements IPlatformService {
 		this.$logger.trace("Changes info in prepare platform:", changesInfo);
 
 		if (changesInfo.hasChanges) {
-			// android build artifacts need to be cleaned up when switching from release to debug builds
-			if (platform.toLowerCase() === "android") {
-				let previousPrepareInfo = this.$projectChangesService.getPrepareInfo(platform, projectData);
-				// clean up prepared plugins when not building for release
-				if (previousPrepareInfo && previousPrepareInfo.release !== appFilesUpdaterOptions.release) {
-					await platformData.platformProjectService.cleanProject(platformData.projectRoot, projectData);
-				}
-			}
-
+			await this.cleanProject(platform, appFilesUpdaterOptions, platformData, projectData);
 			await this.preparePlatformCore(platform, appFilesUpdaterOptions, projectData, config, changesInfo, filesToSync);
 			this.$projectChangesService.savePrepareInfo(platform, projectData);
 		} else {
@@ -269,6 +261,25 @@ export class PlatformService extends EventEmitter implements IPlatformService {
 		}
 	}
 
+	private async cleanProject(platform: string, appFilesUpdaterOptions: IAppFilesUpdaterOptions, platformData: IPlatformData, projectData: IProjectData): Promise<void> {
+		// android build artifacts need to be cleaned up
+		// when switching between debug, release and webpack builds
+		if (platform.toLowerCase() !== "android") {
+			return;
+		}
+
+		const previousPrepareInfo = this.$projectChangesService.getPrepareInfo(platform, projectData);
+		if (!previousPrepareInfo) {
+			return;
+		}
+
+		const { release: previousWasRelease, bundle: previousWasBundle } = previousPrepareInfo;
+		const { release: currentIsRelease, bundle: currentIsBundle } = appFilesUpdaterOptions;
+		if ((previousWasRelease !== currentIsRelease) || (previousWasBundle !== currentIsBundle)) {
+			await platformData.platformProjectService.cleanProject(platformData.projectRoot, projectData);
+		}
+	}
+
 	/* Hooks are expected to use "filesToSync" parameter, as to give plugin authors additional information about the sync process.*/
 	@helpers.hook('prepare')
 	private async preparePlatformCore(platform: string, appFilesUpdaterOptions: IAppFilesUpdaterOptions, projectData: IProjectData, platformSpecificData: IPlatformSpecificData, changesInfo?: IProjectChangesInfo, filesToSync?: Array<String>): Promise<void> {

lib/services/platform-service.ts

@@ -1,7 +1,7 @@
 {
   "name": "nativescript",
   "preferGlobal": true,
-  "version": "3.0.1",
+  "version": "3.0.3",
   "author": "Telerik <support@telerik.com>",
   "description": "Command-line interface for building NativeScript projects",
   "bin": {

package.json

@@ -162,7 +162,8 @@ async function setupProject(dependencies?: any): Promise<any> {
 				interpolateConfigurationFile: (): void => undefined,
 				isPlatformPrepared: (projectRoot: string) => false,
 				validatePlugins: (projectData: IProjectData) => Promise.resolve(),
-				checkForChanges: () => { /* */ }
+				checkForChanges: () => { /* */ },
+				cleanProject: () => Promise.resolve()
 			}
 		};
 	};
@@ -319,7 +320,7 @@ describe("Flatten npm modules tests", () => {
 		let gulpJshint = path.join(tnsModulesFolderPath, "gulp-jshint");
 		assert.isFalse(fs.exists(gulpJshint));
 
-		// Get  all gulp dependencies
+		// Get	all gulp dependencies
 		let gulpJsonContent = fs.readJson(path.join(projectFolder, nodeModulesFolderName, "gulp", packageJsonName));
 		_.each(_.keys(gulpJsonContent.dependencies), dependency => {
 			assert.isFalse(fs.exists(path.join(tnsModulesFolderPath, dependency)));