chore: merge 'release' into 'master'

Author: DimitarTachev

Gruntfile.js

@@ -29,13 +29,6 @@ var travis = process.env["TRAVIS"];
 var buildNumber = process.env["PACKAGE_VERSION"] || process.env["BUILD_NUMBER"] || "non-ci";
 
 module.exports = function (grunt) {
-	var path = require("path");
-	var commonLibNodeModules = path.join("lib", "common", "node_modules");
-	if (require("fs").existsSync(commonLibNodeModules)) {
-		grunt.file.delete(commonLibNodeModules);
-	}
-	grunt.file.write(path.join("lib", "common", ".d.ts"), "");
-
 	grunt.initConfig({
 		copyPackageTo: process.env["CopyPackageTo"] || ".",
 
@@ -229,7 +222,7 @@ module.exports = function (grunt) {
 		if (travis && process.env.TRAVIS_PULL_REQUEST_BRANCH) {
 			return grunt.task.run("pack");
 		}
-		
+
 		// Set correct version in Travis job, so the deploy will not publish strict version (for example 5.2.0).
 		grunt.task.run("set_package_version");
 		console.log(`Skipping pack step as the current build is not from PR, so it will be packed from the deploy provider.`);

docs/man_pages/project/testing/build-android.md

@@ -24,7 +24,7 @@ General | `$ tns build android [--compileSdk <API Level>] [--key-store-path <Fil
 * `--key-store-password` - Provides the password for the keystore file specified with `--key-store-path`. You can use the `--key-store-*` options along with `--release` to produce a signed release build. You need to specify all `--key-store-*` options.
 * `--key-store-alias` - Provides the alias for the keystore file specified with `--key-store-path`. You can use the `--key-store-*` options along with `--release` to produce a signed release build. You need to specify all `--key-store-*` options.
 * `--key-store-alias-password` - Provides the password for the alias specified with `--key-store-alias-password`. You can use the `--key-store-*` options along with `--release` to produce a signed release build. You need to specify all `--key-store-*` options.
-* `--copy-to` - Specifies the file path where the built `.apk` will be copied. If it points to a non-existent directory, it will be created. If the specified value is directory, the original file name will be used.
+* `--copy-to` - Specifies the file path where the built `.apk` will be copied. If it points to a non-existent directory path, it will be created. If the specified value is existing directory, the original file name will be used.
 * `--bundle` - Specifies that the `webpack` bundler will be used to bundle the application.
 * `--env.*` - Specifies additional flags that the bundler may process. May be passed multiple times. For example: `--env.uglify --env.snapshot`.
 * `--aab` - Specifies that the build will produce an Android App Bundle(`.aab`) file.

docs/man_pages/project/testing/build-ios.md

@@ -23,7 +23,7 @@ General | `$ tns build ios [--for-device] [--release] [--copy-to <File Path>] [-
 
 * `--release` - If set, produces a release build. Otherwise, produces a debug build.
 * `--for-device` - If set, produces an application package that you can deploy on device. Otherwise, produces a build that you can run only in the native iOS Simulator.
-* `--copy-to` - Specifies the file path where the built `.ipa` will be copied. If it points to a non-existent directory, it will be created. If the specified value is directory, the original file name will be used.
+* `--copy-to` - Specifies the file path where the built `.ipa` will be copied. If it points to a non-existent directory path, it will be created. If the specified value is existing directory, the original file name will be used.
 * `--team-id` - If used without parameter, lists all team names and ids. If used with team name or id, it will switch to automatic signing mode and configure the .xcodeproj file of your app. In this case .xcconfig should not contain any provisioning/team id flags. This team id will be further used for codesigning the app. For Xcode 9.0+, xcodebuild will be allowed to update and modify automatically managed provisioning profiles.
 * `--provision` - If used without parameter, lists all eligible provisioning profiles. If used with UUID or name of your provisioning profile, it will switch to manual signing mode and configure the .xcodeproj file of your app. In this case xcconfig should not contain any provisioning/team id flags. This provisioning profile will be further used for codesigning the app.
 * `--bundle` - Specifies that the `webpack` bundler will be used to bundle the application.

lib/bootstrap.ts

@@ -17,6 +17,7 @@ $injector.require("iOSProvisionService", "./services/ios-provision-service");
 $injector.require("xcconfigService", "./services/xcconfig-service");
 
 $injector.require("cocoapodsService", "./services/cocoapods-service");
+$injector.require("cocoaPodsPlatformManager", "./services/cocoapods-platform-manager");
 
 $injector.require("projectTemplatesService", "./services/project-templates-service");
 $injector.require("projectNameService", "./services/project-name-service");

lib/commands/test.ts

@@ -1,30 +1,75 @@
 import * as helpers from "../common/helpers";
 
-function RunKarmaTestCommandFactory(platform: string) {
-	return function RunKarmaTestCommand($options: IOptions, $testExecutionService: ITestExecutionService, $projectData: IProjectData, $analyticsService: IAnalyticsService, $platformEnvironmentRequirements: IPlatformEnvironmentRequirements) {
-		$projectData.initializeProjectData();
-		$analyticsService.setShouldDispose($options.justlaunch || !$options.watch);
-		const projectFilesConfig = helpers.getProjectFilesConfig({ isReleaseBuild: $options.release });
-		this.execute = (args: string[]): Promise<void> => $testExecutionService.startKarmaServer(platform, $projectData, projectFilesConfig);
-		this.canExecute = (args: string[]): Promise<boolean> => canExecute({ $platformEnvironmentRequirements, $projectData, $options, platform });
-		this.allowedParameters = [];
-	};
-}
+abstract class TestCommandBase {
+	public allowedParameters: ICommandParameter[] = [];
+	private projectFilesConfig: IProjectFilesConfig;
+	protected abstract platform: string;
+	protected abstract $projectData: IProjectData;
+	protected abstract $testExecutionService: ITestExecutionService;
+	protected abstract $analyticsService: IAnalyticsService;
+	protected abstract $options: IOptions;
+	protected abstract $platformEnvironmentRequirements: IPlatformEnvironmentRequirements;
+	protected abstract $errors: IErrors;
+
+	async execute(args: string[]): Promise<void> {
+		await this.$testExecutionService.startKarmaServer(this.platform, this.$projectData, this.projectFilesConfig);
+	}
+
+	async canExecute(args: string[]): Promise<boolean | ICanExecuteCommandOutput> {
+		this.$projectData.initializeProjectData();
+		this.$analyticsService.setShouldDispose(this.$options.justlaunch || !this.$options.watch);
+		this.projectFilesConfig = helpers.getProjectFilesConfig({ isReleaseBuild: this.$options.release });
 
-async function canExecute(input: { $platformEnvironmentRequirements: IPlatformEnvironmentRequirements, $projectData: IProjectData, $options: IOptions, platform: string }): Promise<boolean> {
-	const { $platformEnvironmentRequirements, $projectData, $options, platform } = input;
-	const output = await $platformEnvironmentRequirements.checkEnvironmentRequirements({
-		platform,
-		projectDir: $projectData.projectDir,
-		options: $options,
-		notConfiguredEnvOptions: {
-			hideSyncToPreviewAppOption: true,
-			hideCloudBuildOption: true
+		const output = await this.$platformEnvironmentRequirements.checkEnvironmentRequirements({
+			platform: this.platform,
+			projectDir: this.$projectData.projectDir,
+			options: this.$options,
+			notConfiguredEnvOptions: {
+				hideSyncToPreviewAppOption: true,
+				hideCloudBuildOption: true
+			}
+		});
+
+		const canStartKarmaServer = await this.$testExecutionService.canStartKarmaServer(this.$projectData);
+		if (!canStartKarmaServer) {
+			this.$errors.fail({
+				formatStr: "Error: In order to run unit tests, your project must already be configured by running $ tns test init.",
+				suppressCommandHelp: true,
+				errorCode: ErrorCodes.TESTS_INIT_REQUIRED
+			});
 		}
-	});
 
-	return output.canExecute;
+		return output.canExecute && canStartKarmaServer;
+	}
+}
+
+class TestAndroidCommand extends TestCommandBase implements ICommand {
+	protected platform = "android";
+
+	constructor(protected $projectData: IProjectData,
+		protected $testExecutionService: ITestExecutionService,
+		protected $analyticsService: IAnalyticsService,
+		protected $options: IOptions,
+		protected $platformEnvironmentRequirements: IPlatformEnvironmentRequirements,
+		protected $errors: IErrors) {
+		super();
+	}
+
+}
+
+class TestIosCommand extends TestCommandBase implements ICommand {
+	protected platform = "iOS";
+
+	constructor(protected $projectData: IProjectData,
+		protected $testExecutionService: ITestExecutionService,
+		protected $analyticsService: IAnalyticsService,
+		protected $options: IOptions,
+		protected $platformEnvironmentRequirements: IPlatformEnvironmentRequirements,
+		protected $errors: IErrors) {
+		super();
+	}
+
 }
 
-$injector.registerCommand("test|android", RunKarmaTestCommandFactory('android'));
-$injector.registerCommand("test|ios", RunKarmaTestCommandFactory('iOS'));
+$injector.registerCommand("test|android", TestAndroidCommand);
+$injector.registerCommand("test|ios", TestIosCommand);

lib/common/Gruntfile.js

@@ -596,6 +596,7 @@ declare const enum ErrorCodes {
 	KARMA_FAIL = 130,
 	UNHANDLED_REJECTION_FAILURE = 131,
 	DELETED_KILL_FILE = 132,
+	TESTS_INIT_REQUIRED = 133
 }
 
 interface IFutureDispatcher {
@@ -1168,6 +1169,13 @@ interface IDoctorService {
 	 * @returns {Promise<boolean>} true if the environment is properly configured for local builds
 	 */
 	canExecuteLocalBuild(platform?: string, projectDir?: string, runtimeVersion?: string): Promise<boolean>;
+
+	/**
+	 * Checks and notifies users for deprecated short imports in their applications.
+	 * @param {string} projectDir Path to the application.
+	 * @returns {void}
+	 */
+	checkForDeprecatedShortImportsInAppDir(projectDir: string): void;
 }
 
 interface IUtils {

lib/common/declarations.d.ts

@@ -107,9 +107,9 @@ declare module Mobile {
 
 	interface IiOSDevice extends IDevice {
 		getDebugSocket(appId: string, projectName: string): Promise<any>;
-		destroyDebugSocket(appId: string): void;
+		destroyDebugSocket(appId: string): Promise<void>;
 		openDeviceLogStream(options?: IiOSLogStreamOptions): Promise<void>;
-		destroyAllSockets(): void;
+		destroyAllSockets(): Promise<void>;
 	}
 
 	interface IAndroidDevice extends IDevice {

lib/common/definitions/mobile.d.ts

@@ -1,6 +1,7 @@
 import * as util from "util";
 import * as path from "path";
 import { SourceMapConsumer } from "source-map";
+import { isInteractive } from "./helpers";
 
 // we need this to overwrite .stack property (read-only in Error)
 function Exception() {
@@ -159,7 +160,7 @@ export class Errors implements IErrors {
 		} catch (ex) {
 			const loggerLevel: string = $injector.resolve("logger").getLevel().toUpperCase();
 			const printCallStack = this.printCallStack || loggerLevel === "TRACE" || loggerLevel === "DEBUG";
-			const message = printCallStack ? resolveCallStack(ex) : `\x1B[31;1m${ex.message}\x1B[0m`;
+			const message = printCallStack ? resolveCallStack(ex) : isInteractive() ? `\x1B[31;1m${ex.message}\x1B[0m` : ex.message;
 
 			if (ex.printOnStdout) {
 				this.$injector.resolve("logger").out(message);