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

chore: Merge release in master

Author: Fatme

CHANGELOG.md

@@ -1,6 +1,25 @@
 NativeScript CLI Changelog
 ================
 
+4.0.0rc (2018, March 23)
+==
+
+### New
+* [Implemented #3243](https://github.com/NativeScript/nativescript-cli/issues/3243) 'Scss' file changes trigger app refresh instead reloading the view and apply generated 'css'
+* [Implemented #3248](https://github.com/NativeScript/nativescript-cli/issues/3248) Support JDK_HOME and JAVA_HOME
+* [Implemented #3257](https://github.com/NativeScript/nativescript-cli/issues/3257) Make {N} project structure configurable
+* [Implemented #3317](https://github.com/NativeScript/nativescript-cli/issues/3317) Support livesync with webpack
+* [Implemented #3449](https://github.com/NativeScript/nativescript-cli/pull/3449) Track Vue.js project type
+* [Implemented #3496](https://github.com/NativeScript/nativescript-cli/issues/3496) Generate assets for the mobile application
+* [Implemented #3497](https://github.com/NativeScript/nativescript-cli/issues/3497) Command to migrate Android resources to 4.0.0 structure
+
+### Fixed
+* [Fixed #3151](https://github.com/NativeScript/nativescript-cli/issues/3151): Install fails if user setting file is not valid json
+* [Fixed #3324](https://github.com/NativeScript/nativescript-cli/issues/3324): Error when iOS simulator's window is closed
+* [Fixed #3442](https://github.com/NativeScript/nativescript-cli/issues/3442): Unnecessary second build upon `tns run android`
+* [Fixed #3451](https://github.com/NativeScript/nativescript-cli/issues/3451): `tns plugin remove` fails with : Cannot convert undefined or null to object
+
+
 3.4.3 (2018, March 02)
 ==
 

docs/man_pages/project/configuration/resources/resources-generate-splashes.md

@@ -6,13 +6,16 @@ position: 12
 
 Usage | Synopsis
 ------|-------
-`$ tns resources generate splashes <Path to image> [<background>]` | Generate all splashscreens for Android and iOS based on the specified image.
+`$ tns resources generate splashes <Path to image> [--background <Color>]` | Generate all splashscreens for Android and iOS based on the specified image.
 
-Generates all icons for Android and iOS platforms and places the generated images in the correct directories under `App_Resources/<platform>` directory.
+Generates all splashscreens for Android and iOS platforms and places the generated images in the correct directories under `App_Resources/<platform>` directory.
+
+### Options
+* `--background` Sets the background color of the splashscreen. Defaults to white in case it is not specified.
 
 ### Attributes
 * `<Path to image>` is a valid path to an image that will be used to generate all splashscreens.
-* `<background>` is a valid path to an image that will be used as a background of the splashscreen. Defaults to white in case it is not specified.
+* `<Color>` is a valid color. It can be represented with string, like `white`, `black`, `blue`, etc. or its HEX representation, for example `#FFFFFF`, `#000000`, `#0000FF`. NOTE: As the `#` is special symbol in some terminals, make sure to place the value in quotes, for example `$ tns resources generate splashes ../myImage.png --background "#FF00FF"`.
 
 <% if(isHtml) { %>
 ### Related Commands

lib/bootstrap.ts

@@ -160,7 +160,7 @@ $injector.require("terminalSpinnerService", "./services/terminal-spinner-service
 
 $injector.require('playgroundService', './services/playground-service');
 $injector.require("platformEnvironmentRequirements", "./services/platform-environment-requirements");
-$injector.require("nativescriptCloudExtensionService", "./services/nativescript-cloud-extension-service");
+$injector.require("nativeScriptCloudExtensionService", "./services/nativescript-cloud-extension-service");
 
 $injector.requireCommand("resources|generate|icons", "./commands/generate-assets");
 $injector.requireCommand("resources|generate|splashes", "./commands/generate-assets");

lib/commands/create-project.ts

@@ -1,10 +1,14 @@
 import * as constants from "../constants";
+import * as path from "path";
 
 export class CreateProjectCommand implements ICommand {
 	public enableHooks = false;
 	public allowedParameters: ICommandParameter[] = [this.$stringParameterBuilder.createMandatoryParameter("Project name cannot be empty.")];
 
+	private createdProjecData: ICreateProjectData;
+
 	constructor(private $projectService: IProjectService,
+		private $logger: ILogger,
 		private $errors: IErrors,
 		private $options: IOptions,
 		private $stringParameterBuilder: IStringParameterBuilder) { }
@@ -23,7 +27,7 @@ export class CreateProjectCommand implements ICommand {
 			selectedTemplate = this.$options.template;
 		}
 
-		await this.$projectService.createProject({
+		this.createdProjecData = await this.$projectService.createProject({
 			projectName: args[0],
 			template: selectedTemplate,
 			appId: this.$options.appid,
@@ -32,6 +36,13 @@ export class CreateProjectCommand implements ICommand {
 			ignoreScripts: this.$options.ignoreScripts
 		});
 	}
+
+	public async postCommandAction(args: string[]): Promise<void> {
+		const { projectDir } = this.createdProjecData;
+		const relativePath = path.relative(process.cwd(), projectDir);
+		this.$logger.printMarkdown(`Now you can navigate to your project with \`$ cd ${relativePath}\``);
+		this.$logger.printMarkdown(`After that you can run it on device/emulator by executing \`$ tns run <platform>\``);
+	}
 }
 
 $injector.registerCommand("create", CreateProjectCommand);

lib/commands/post-install.ts

@@ -18,6 +18,27 @@ export class PostInstallCliCommand extends PostInstallCommand {
 
 		await this.$subscriptionService.subscribeForNewsletter();
 	}
+
+	public async postCommandAction(args: string[]): Promise<void> {
+		this.$logger.info("You have successfully installed NativeScript CLI.");
+		this.$logger.info("In order to create a new project, you can use:".green);
+		this.$logger.printMarkdown("`tns create <app name>`");
+		this.$logger.info("To build your project locally you can use:".green);
+		this.$logger.printMarkdown("`tns build <platform>`");
+		this.$logger.printMarkdown("NOTE: Local builds require additional setup of your environment. You can find more information here: `https://docs.nativescript.org/start/quick-setup`");
+
+		// Add a new line just to ensure separation between local builds and cloud builds info.
+		this.$logger.info("");
+		this.$logger.info("To build your project in the cloud you can use:".green);
+		this.$logger.printMarkdown("`tns cloud build <platform>`");
+		this.$logger.printMarkdown("NOTE: Cloud builds require Telerik account. You can find more information here: `https://docs.nativescript.org/sidekick/intro/requirements`");
+
+		this.$logger.info("");
+		this.$logger.printMarkdown("In case you want to experiment quickly with NativeScript, you can try the Playground: `https://play.nativescript.org`");
+
+		this.$logger.info("");
+		this.$logger.printMarkdown("In case you have any questions, you can check our forum: `https://forum.nativescript.org` and our public Slack channel: `https://nativescriptcommunity.slack.com/`");
+	}
 }
 
 $injector.registerCommand("post-install-cli", PostInstallCliCommand);

lib/commands/run.ts

@@ -28,7 +28,7 @@ export class RunCommandBase implements ICommand {
 			this.platform = this.$devicePlatformsConstants.Android;
 		}
 
-		this.$liveSyncCommandHelper.validatePlatform(this.platform);
+		await this.$liveSyncCommandHelper.validatePlatform(this.platform);
 
 		return true;
 	}

lib/commands/setup.ts

@@ -12,10 +12,10 @@ $injector.registerCommand("setup|*", SetupCommand);
 export class CloudSetupCommand implements ICommand {
 	public allowedParameters: ICommandParameter[] = [];
 
-	constructor(private $nativescriptCloudExtensionService: INativescriptCloudExtensionService) { }
+	constructor(private $nativeScriptCloudExtensionService: INativeScriptCloudExtensionService) { }
 
 	public execute(args: string[]): Promise<any> {
-		return this.$nativescriptCloudExtensionService.install();
+		return this.$nativeScriptCloudExtensionService.install();
 	}
 }
 $injector.registerCommand(["setup|cloud", "cloud|setup"], CloudSetupCommand);

lib/common

@@ -135,7 +135,10 @@ export const enum TrackActionNames {
 	CreateProject = "Create project",
 	Debug = "Debug",
 	Deploy = "Deploy",
-	LiveSync = "LiveSync"
+	LiveSync = "LiveSync",
+	RunSetupScript = "Run Setup Script",
+	CheckLocalBuildSetup = "Check Local Build Setup",
+	CheckEnvironmentRequirements = "Check Environment Requirements"
 }
 
 export const enum BuildStates {

lib/constants.ts

@@ -788,12 +788,17 @@ interface IBundleValidatorHelper {
 	validate(): void;
 }
 
-interface INativescriptCloudExtensionService {
+interface INativeScriptCloudExtensionService {
 	/**
 	 * Installs nativescript-cloud extension
 	 * @return {Promise<IExtensionData>} returns the extension data
 	 */
 	install(): Promise<IExtensionData>;
+	/**
+	 * Checks if nativescript-cloud extension is installed
+	 * @return {boolean} returns true in case when nativescript-cloud extension is installed, false otherwise
+	 */
+	isInstalled(): boolean
 }
 
 /**

lib/declarations.d.ts

@@ -381,5 +381,5 @@ interface IUpdateAppOptions extends IOptionalFilesToSync, IOptionalFilesToRemove
 }
 
 interface IPlatformEnvironmentRequirements {
-	checkEnvironmentRequirements(platform: string): Promise<boolean>;
+	checkEnvironmentRequirements(platform?: string): Promise<boolean>;
 }

lib/definitions/platform.d.ts

@@ -37,13 +37,21 @@ interface IProjectSettings {
 	ignoreScripts?: boolean;
 }
 
+interface IProjectName {
+	projectName: string;
+}
+
+interface ICreateProjectData extends IProjectDir, IProjectName {
+
+}
+
 interface IProjectService {
 	/**
 	 * Creates new NativeScript application.
 	 * @param {any} projectSettings Options describing new project - its name, appId, path and template from which to be created.
 	 * @returns {Promise<void>}
 	 */
-	createProject(projectSettings: IProjectSettings): Promise<void>;
+	createProject(projectSettings: IProjectSettings): Promise<ICreateProjectData>;
 
 	/**
 	 * Checks if the specified project is valid NativeScript project.
@@ -58,8 +66,7 @@ interface INsConfig {
 	appResourcesPath?: string;
 }
 
-interface IProjectData extends IProjectDir {
-	projectName: string;
+interface IProjectData extends ICreateProjectData {
 	platformsDir: string;
 	projectFilePath: string;
 	projectId?: string;
@@ -394,12 +401,6 @@ interface IPlatformProjectService extends NodeJS.EventEmitter {
 	executeCommand(projectRoot: string, args: any, childProcessOpts?: any, spawnFromEventOptions?: ISpawnFromEventOptions): Promise<ISpawnResult>;
 }
 
-interface IAndroidProjectPropertiesManager {
-	getProjectReferences(): Promise<ILibRef[]>;
-	addProjectReference(referencePath: string): Promise<void>;
-	removeProjectReference(referencePath: string): Promise<void>;
-}
-
 interface ITestExecutionService {
 	startTestRunner(platform: string, projectData: IProjectData, projectFilesConfig: IProjectFilesConfig): Promise<void>;
 	startKarmaServer(platform: string, projectData: IProjectData, projectFilesConfig: IProjectFilesConfig): Promise<void>;

lib/definitions/project.d.ts

@@ -73,7 +73,7 @@ export class AnalyticsService extends AnalyticsServiceBase {
 
 		// In some cases (like in case action is Build and platform is Android), we do not know if the deviceType is emulator or device.
 		// Just exclude the device_type in this case.
-		if (isForDevice !== null) {
+		if (isForDevice !== null && isForDevice !== undefined) {
 			const deviceType = isForDevice ? DeviceTypes.Device : (this.$mobileHelper.isAndroidPlatform(platform) ? DeviceTypes.Emulator : DeviceTypes.Simulator);
 			label = this.addDataToLabel(label, deviceType);
 		}

lib/definitions/simple-plist.d.ts

@@ -4,7 +4,6 @@ import { AnalyticsClients } from "../../common/constants";
 
 export class GoogleAnalyticsProvider implements IGoogleAnalyticsProvider {
 	private static GA_TRACKING_ID = "UA-111455-44";
-	private static GA_CROSS_CLIENT_TRACKING_ID = "UA-111455-51";
 	private currentPage: string;
 
 	constructor(private clientId: string,
@@ -15,15 +14,12 @@ export class GoogleAnalyticsProvider implements IGoogleAnalyticsProvider {
 	}
 
 	public async trackHit(trackInfo: IGoogleAnalyticsData): Promise<void> {
-		const trackingIds = [GoogleAnalyticsProvider.GA_TRACKING_ID, GoogleAnalyticsProvider.GA_CROSS_CLIENT_TRACKING_ID];
 		const sessionId = uuid.v4();
 
-		for (const gaTrackingId of trackingIds) {
-			try {
-				await this.track(gaTrackingId, trackInfo, sessionId);
-			} catch (e) {
-				this.$logger.trace("Analytics exception: ", e);
-			}
+		try {
+			await this.track(GoogleAnalyticsProvider.GA_TRACKING_ID, trackInfo, sessionId);
+		} catch (e) {
+			this.$logger.trace("Analytics exception: ", e);
 		}
 	}
 
@@ -41,14 +37,7 @@ export class GoogleAnalyticsProvider implements IGoogleAnalyticsProvider {
 			}
 		});
 
-		switch (gaTrackingId) {
-			case GoogleAnalyticsProvider.GA_CROSS_CLIENT_TRACKING_ID:
-				this.setCrossClientCustomDimensions(visitor, sessionId);
-				break;
-			default:
-				await this.setCustomDimensions(visitor, trackInfo.customDimensions, sessionId);
-				break;
-		}
+		await this.setCustomDimensions(visitor, trackInfo.customDimensions, sessionId);
 
 		switch (trackInfo.googleAnalyticsDataType) {
 			case GoogleAnalyticsDataType.Page:
@@ -83,18 +72,6 @@ export class GoogleAnalyticsProvider implements IGoogleAnalyticsProvider {
 		});
 	}
 
-	private async setCrossClientCustomDimensions(visitor: ua.Visitor, sessionId: string): Promise<void> {
-		const customDimensions: IStringDictionary = {
-			[GoogleAnalyticsCrossClientCustomDimensions.sessionId]: sessionId,
-			[GoogleAnalyticsCrossClientCustomDimensions.clientId]: this.clientId,
-			[GoogleAnalyticsCrossClientCustomDimensions.crossClientId]: this.clientId,
-		};
-
-		_.each(customDimensions, (value, key) => {
-			visitor.set(key, value);
-		});
-	}
-
 	private trackEvent(visitor: ua.Visitor, trackInfo: IGoogleAnalyticsEventData): Promise<void> {
 		return new Promise<void>((resolve, reject) => {
 			visitor.event(trackInfo.category, trackInfo.action, trackInfo.label, trackInfo.value, { p: this.currentPage }, (err: Error) => {

lib/services/analytics/analytics-service.ts

@@ -253,9 +253,11 @@ export class AndroidPluginBuildService implements IAndroidPluginBuildService {
 			const androidToolsInfo = this.$androidToolsInfo.getToolsInfo();
 			const compileSdk = androidToolsInfo.compileSdkVersion;
 			const buildToolsVersion = androidToolsInfo.buildToolsVersion;
+			const supportVersion = androidToolsInfo.supportRepositoryVersion;
 
 			localArgs.push(`-PcompileSdk=android-${compileSdk}`);
 			localArgs.push(`-PbuildToolsVersion=${buildToolsVersion}`);
+			localArgs.push(`-PsupportVersion=${supportVersion}`);
 
 			try {
 				await this.$childProcess.exec(localArgs.join(" "), { cwd: newPluginDir });