chore: merge release in master

docs/man_pages/general/migrate.md

@@ -0,0 +1,63 @@
+<% if (isJekyll) { %>---
+title: tns migrate
+position: 15
+---<% } %>
+
+# tns migrate
+
+### Description
+
+Migrates the app dependencies to a form compatible with NativeScript 6.0. Running this command will not affect the codebase of the application and you might need to do additional changes manually.
+
+The migrate command will update **"webpack.config.js"**, **"karma.conf.js"**, **"tsconfig.tns.json"**(not for code sharing projects) and **"package-lock.json"**. The original files will be moved to **".migration_backup"** folder.
+The following folders will be removed: **"hooks"**, **"platforms"** and **"node_modules"**. The **"hooks"** folder will also be backed up in **".migration_backup"** folder.
+
+The **"nativescript-dev-sass"** and **"nativescript-dev-typescript"** dependencies will be replaced with **"node-sass"** and **"typescript"** respectively.
+The **"nativescript-dev-less"** dependency will be removed, but to enable LESS CSS support the user should follow the steps in this<% if(isConsole) { %> feature request: https://github.com/NativeScript/nativescript-dev-webpack/issues/967.<% } %><% if(isHtml) { %> [feature request](https://github.com/NativeScript/nativescript-dev-webpack/issues/967).<% } %>
+
+The following dependencies will be updated if needed: 
+* tns-core-modules
+* tns-core-modules-widgets
+* tns-platform-declarations
+* nativescript-dev-webpack
+* nativescript-camera
+* nativescript-geolocation
+* nativescript-imagepicker
+* nativescript-permissions
+* nativescript-social-share
+* nativescript-ui-chart
+* nativescript-ui-dataform
+* nativescript-ui-gauge
+* nativescript-ui-listview
+* nativescript-ui-sidedrawer
+* nativescript-ui-calendar
+* nativescript-ui-autocomplete
+* nativescript-cardview
+* nativescript-datetimepicker
+* kinvey-nativescript-sdk
+* nativescript-plugin-firebase
+* nativescript-vue
+* nativescript-unit-test-runner
+* karma-webpack
+* karma-jasmine
+* karma-mocha
+* karma-chai
+* karma-qunit
+* karma
+
+### Commands
+
+Usage | Synopsis
+------|-------
+General | `$ tns migrate`
+
+<% if(isHtml) { %>
+
+### Related Commands
+
+Command | Description
+----------|----------
+[update](update.html) | Updates the project with the latest versions of iOS/Android runtimes and cross-platform modules.
+[help](help.html) | Lists the available commands or shows information about the selected command.
+[doctor](doctor.html) | Checks your system for configuration problems which might prevent the NativeScript CLI from working properly.
+<% } %>

docs/man_pages/general/package-manager-get.md

@@ -1,6 +1,6 @@
 <% if (isJekyll) { %>---
 title: tns package-manager get
-position: 18
+position: 19
 ---<% } %>
 
 # tns package-manager get

docs/man_pages/general/package-manager-set.md

@@ -1,6 +1,6 @@
 <% if (isJekyll) { %>---
 title: tns package-manager set
-position: 17
+position: 18
 ---<% } %>
 
 # tns package-manager set

docs/man_pages/general/update.md

@@ -1,19 +1,21 @@
 <% if (isJekyll) { %>---
 title: tns update
-position: 15
+position: 16
 ---<% } %>
 
 # tns update
 
 ### Description
 
-Updates the project with the latest versions of iOS/Android runtimes and cross-platform modules.
+Updates the project with the latest versions of iOS/Android runtimes, cross-platform modules and "nativescript-dev-webpack".
 In order to get the latest development release instead, pass `next` as argument:
 `tns update next`
 
 You can also switch to specific version by passing it to the command:
 `tns update 5.0.0`
 
+**NOTE:** The provided version should be an existing version of the project template for this project type.
+
 ### Commands
 
 Usage | Synopsis

docs/man_pages/general/usage-reporting.md

@@ -1,6 +1,6 @@
 <% if (isJekyll) { %>---
 title: tns usage-reporting
-position: 16
+position: 17
 ---<% } %>
 
 # tns usage-reporting

docs/man_pages/index.md

@@ -21,6 +21,7 @@ Command | Description
 [doctor](general/doctor.html) | Checks your system for configuration problems which might prevent the NativeScript CLI from working properly.
 [info](general/info.html) | Displays version information about the NativeScript CLI, core modules, and runtimes.
 [proxy](general/proxy.html) | Displays proxy settings.
+[migrate](general/migrate.html) | Migrates the app dependencies to a form compatible with NativeScript 6.0.
 [update](general/update.html) | Updates the project with the latest versions of iOS/Android runtimes and cross-platform modules.
 
 ## Project Development Commands

lib/bootstrap.ts

@@ -144,7 +144,6 @@ $injector.require("devicePathProvider", "./device-path-provider");
 
 $injector.requireCommand("platform|clean", "./commands/platform-clean");
 
-$injector.require("bundleValidatorHelper", "./helpers/bundle-validator-helper");
 $injector.require("androidBundleValidatorHelper", "./helpers/android-bundle-validator-helper");
 $injector.require("liveSyncCommandHelper", "./helpers/livesync-command-helper");
 $injector.require("deployCommandHelper", "./helpers/deploy-command-helper");

lib/commands/build.ts

@@ -9,11 +9,10 @@ export abstract class BuildCommandBase extends ValidatePlatformCommandBase {
 		protected $devicePlatformsConstants: Mobile.IDevicePlatformsConstants,
 		protected $buildController: IBuildController,
 		$platformValidationService: IPlatformValidationService,
-		private $bundleValidatorHelper: IBundleValidatorHelper,
 		private $buildDataService: IBuildDataService,
 		protected $logger: ILogger) {
-			super($options, $platformsDataService, $platformValidationService, $projectData);
-			this.$projectData.initializeProjectData();
+		super($options, $platformsDataService, $platformValidationService, $projectData);
+		this.$projectData.initializeProjectData();
 	}
 
 	public dashedOptions = {
@@ -33,8 +32,6 @@ export abstract class BuildCommandBase extends ValidatePlatformCommandBase {
 		if (!this.$platformValidationService.isPlatformSupportedForOS(platform, this.$projectData)) {
 			this.$errors.fail(`Applications for platform ${platform} can not be built on this OS`);
 		}
-
-		this.$bundleValidatorHelper.validate(this.$projectData);
 	}
 
 	protected async validateArgs(args: string[], platform: string): Promise<ICanExecuteCommandOutput> {
@@ -65,10 +62,10 @@ export class BuildIosCommand extends BuildCommandBase implements ICommand {
 		$devicePlatformsConstants: Mobile.IDevicePlatformsConstants,
 		$buildController: IBuildController,
 		$platformValidationService: IPlatformValidationService,
-		$bundleValidatorHelper: IBundleValidatorHelper,
 		$logger: ILogger,
-		$buildDataService: IBuildDataService) {
-			super($options, $errors, $projectData, $platformsDataService, $devicePlatformsConstants, $buildController, $platformValidationService, $bundleValidatorHelper, $buildDataService, $logger);
+		$buildDataService: IBuildDataService,
+		private $migrateController: IMigrateController) {
+		super($options, $errors, $projectData, $platformsDataService, $devicePlatformsConstants, $buildController, $platformValidationService, $buildDataService, $logger);
 	}
 
 	public async execute(args: string[]): Promise<void> {
@@ -77,6 +74,9 @@ export class BuildIosCommand extends BuildCommandBase implements ICommand {
 
 	public async canExecute(args: string[]): Promise<boolean | ICanExecuteCommandOutput> {
 		const platform = this.$devicePlatformsConstants.iOS;
+		if (!this.$options.force) {
+			await this.$migrateController.validate({ projectDir: this.$projectData.projectDir, platforms: [platform] });
+		}
 
 		super.validatePlatform(platform);
 
@@ -101,11 +101,11 @@ export class BuildAndroidCommand extends BuildCommandBase implements ICommand {
 		$devicePlatformsConstants: Mobile.IDevicePlatformsConstants,
 		$buildController: IBuildController,
 		$platformValidationService: IPlatformValidationService,
-		$bundleValidatorHelper: IBundleValidatorHelper,
 		protected $androidBundleValidatorHelper: IAndroidBundleValidatorHelper,
 		$buildDataService: IBuildDataService,
-		protected $logger: ILogger) {
-			super($options, $errors, $projectData, platformsDataService, $devicePlatformsConstants, $buildController, $platformValidationService, $bundleValidatorHelper, $buildDataService, $logger);
+		protected $logger: ILogger,
+		private $migrateController: IMigrateController) {
+		super($options, $errors, $projectData, platformsDataService, $devicePlatformsConstants, $buildController, $platformValidationService, $buildDataService, $logger);
 	}
 
 	public async execute(args: string[]): Promise<void> {
@@ -122,7 +122,9 @@ export class BuildAndroidCommand extends BuildCommandBase implements ICommand {
 
 	public async canExecute(args: string[]): Promise<boolean | ICanExecuteCommandOutput> {
 		const platform = this.$devicePlatformsConstants.Android;
-		super.validatePlatform(platform);
+		if (!this.$options.force) {
+			await this.$migrateController.validate({ projectDir: this.$projectData.projectDir, platforms: [platform] });
+		}
 		this.$androidBundleValidatorHelper.validateRuntimeVersion(this.$projectData);
 		let result = await super.canExecuteCommandBase(platform, { notConfiguredEnvOptions: { hideSyncToPreviewAppOption: true } });
 		if (result.canExecute) {

lib/commands/debug.ts

@@ -1,12 +1,10 @@
 import { cache } from "../common/decorators";
 import { ValidatePlatformCommandBase } from "./command-base";
-import { LiveSyncCommandHelper } from "../helpers/livesync-command-helper";
 
 export class DebugPlatformCommand extends ValidatePlatformCommandBase implements ICommand {
 	public allowedParameters: ICommandParameter[] = [];
 
 	constructor(private platform: string,
-		private $bundleValidatorHelper: IBundleValidatorHelper,
 		protected $devicesService: Mobile.IDevicesService,
 		$platformValidationService: IPlatformValidationService,
 		$projectData: IProjectData,
@@ -18,7 +16,8 @@ export class DebugPlatformCommand extends ValidatePlatformCommandBase implements
 		private $debugDataService: IDebugDataService,
 		private $debugController: IDebugController,
 		private $liveSyncCommandHelper: ILiveSyncCommandHelper,
-		private $androidBundleValidatorHelper: IAndroidBundleValidatorHelper) {
+		private $androidBundleValidatorHelper: IAndroidBundleValidatorHelper,
+		private $migrateController: IMigrateController) {
 		super($options, $platformsDataService, $platformValidationService, $projectData);
 		$cleanupService.setShouldDispose(false);
 	}
@@ -54,6 +53,10 @@ export class DebugPlatformCommand extends ValidatePlatformCommandBase implements
 	}
 
 	public async canExecute(args: string[]): Promise<ICanExecuteCommandOutput> {
+		if (!this.$options.force) {
+			await this.$migrateController.validate({ projectDir: this.$projectData.projectDir, platforms: [this.platform] });
+		}
+
 		this.$androidBundleValidatorHelper.validateNoAab();
 
 		if (!this.$platformValidationService.isPlatformSupportedForOS(this.platform, this.$projectData)) {
@@ -64,9 +67,6 @@ export class DebugPlatformCommand extends ValidatePlatformCommandBase implements
 			this.$errors.fail("--release flag is not applicable to this command");
 		}
 
-		const minSupportedWebpackVersion = this.$options.hmr ? LiveSyncCommandHelper.MIN_SUPPORTED_WEBPACK_VERSION_WITH_HMR : null;
-		this.$bundleValidatorHelper.validate(this.$projectData, minSupportedWebpackVersion);
-
 		const result = await super.canExecuteCommandBase(this.platform, { validateOptions: true, notConfiguredEnvOptions: { hideCloudBuildOption: true, hideSyncToPreviewAppOption: true } });
 		return result;
 	}

lib/commands/deploy.ts

@@ -17,7 +17,6 @@ export class DeployOnDeviceCommand extends ValidatePlatformCommandBase implement
 		private $errors: IErrors,
 		private $mobileHelper: Mobile.IMobileHelper,
 		$platformsDataService: IPlatformsDataService,
-		private $bundleValidatorHelper: IBundleValidatorHelper,
 		private $deployCommandHelper: DeployCommandHelper,
 		private $androidBundleValidatorHelper: IAndroidBundleValidatorHelper) {
 			super($options, $platformsDataService, $platformValidationService, $projectData);
@@ -31,7 +30,6 @@ export class DeployOnDeviceCommand extends ValidatePlatformCommandBase implement
 
 	public async canExecute(args: string[]): Promise<boolean | ICanExecuteCommandOutput> {
 		this.$androidBundleValidatorHelper.validateNoAab();
-		this.$bundleValidatorHelper.validate(this.$projectData);
 		if (!args || !args.length || args.length > 1) {
 			return false;
 		}

lib/commands/migrate.ts

@@ -2,18 +2,27 @@ export class MigrateCommand implements ICommand {
 	public allowedParameters: ICommandParameter[] = [];
 
 	constructor(
+		private $devicePlatformsConstants: Mobile.IDevicePlatformsConstants,
 		private $migrateController: IMigrateController,
 		private $projectData: IProjectData,
 		private $errors: IErrors) {
 		this.$projectData.initializeProjectData();
 	}
 
 	public async execute(args: string[]): Promise<void> {
-		await this.$migrateController.migrate({projectDir: this.$projectData.projectDir});
+		await this.$migrateController.migrate({
+			projectDir: this.$projectData.projectDir,
+			platforms: [this.$devicePlatformsConstants.Android, this.$devicePlatformsConstants.iOS]
+		});
 	}
 
 	public async canExecute(args: string[]): Promise<boolean> {
-		if (!await this.$migrateController.shouldMigrate({ projectDir: this.$projectData.projectDir })) {
+		const shouldMigrateResult = await this.$migrateController.shouldMigrate({
+			projectDir: this.$projectData.projectDir,
+			platforms: [this.$devicePlatformsConstants.Android, this.$devicePlatformsConstants.iOS]
+		});
+
+		if (!shouldMigrateResult) {
 			this.$errors.failWithoutHelp('Project is compatible with NativeScript "v6.0.0". To get the latest NativesScript packages execute "tns update".');
 		}
 

lib/commands/prepare.ts

@@ -16,9 +16,10 @@ export class PrepareCommand extends ValidatePlatformCommandBase implements IComm
 		$projectData: IProjectData,
 		private $platformCommandParameter: ICommandParameter,
 		$platformsDataService: IPlatformsDataService,
-		private $prepareDataService: PrepareDataService) {
-			super($options, $platformsDataService, $platformValidationService, $projectData);
-			this.$projectData.initializeProjectData();
+		private $prepareDataService: PrepareDataService,
+		private $migrateController: IMigrateController) {
+		super($options, $platformsDataService, $platformValidationService, $projectData);
+		this.$projectData.initializeProjectData();
 	}
 
 	public async execute(args: string[]): Promise<void> {
@@ -32,6 +33,11 @@ export class PrepareCommand extends ValidatePlatformCommandBase implements IComm
 		const platform = args[0];
 		const result = await this.$platformCommandParameter.validate(platform) &&
 			await this.$platformValidationService.validateOptions(this.$options.provision, this.$options.teamId, this.$projectData, platform);
+
+		if (!this.$options.force) {
+			await this.$migrateController.validate({ projectDir: this.$projectData.projectDir, platforms: [platform] });
+		}
+
 		if (!result) {
 			return false;
 		}

lib/commands/preview.ts

@@ -2,12 +2,11 @@ import { DEVICE_LOG_EVENT_NAME } from "../common/constants";
 
 export class PreviewCommand implements ICommand {
 	public allowedParameters: ICommandParameter[] = [];
-	private static MIN_SUPPORTED_WEBPACK_VERSION = "0.17.0";
 
 	constructor(private $analyticsService: IAnalyticsService,
-		private $bundleValidatorHelper: IBundleValidatorHelper,
 		private $errors: IErrors,
 		private $logger: ILogger,
+		private $migrateController: IMigrateController,
 		private $previewAppController: IPreviewAppController,
 		private $networkConnectivityValidator: INetworkConnectivityValidator,
 		private $projectData: IProjectData,
@@ -42,8 +41,11 @@ export class PreviewCommand implements ICommand {
 			this.$errors.fail(`The arguments '${args.join(" ")}' are not valid for the preview command.`);
 		}
 
+		if (!this.$options.force) {
+			await this.$migrateController.validate({ projectDir: this.$projectData.projectDir, platforms: [] });
+		}
+
 		await this.$networkConnectivityValidator.validate();
-		this.$bundleValidatorHelper.validate(this.$projectData, PreviewCommand.MIN_SUPPORTED_WEBPACK_VERSION);
 		return true;
 	}
 }