feat: passing appPath and appResourcesPath through gradle args

rigor789 · rigor789 · commit e915a93cda74 · 2020-09-04T21:44:34.000+02:00
+ remove redundant markingMode migration calls
diff --git a/lib/commands/build.ts b/lib/commands/build.ts
@@ -165,8 +165,7 @@ export class BuildAndroidCommand extends BuildCommandBase implements ICommand {
 		protected $androidBundleValidatorHelper: IAndroidBundleValidatorHelper,
 		$buildDataService: IBuildDataService,
 		protected $logger: ILogger,
-		private $migrateController: IMigrateController,
-		private $markingModeService: IMarkingModeService
+		private $migrateController: IMigrateController
 	) {
 		super(
 			$options,
@@ -182,10 +181,6 @@ export class BuildAndroidCommand extends BuildCommandBase implements ICommand {
 	}
 
 	public async execute(args: string[]): Promise<void> {
-		await this.$markingModeService.handleMarkingModeFullDeprecation({
-			projectDir: this.$projectData.projectDir,
-			skipWarnings: true,
-		});
 		await this.executeCore([
 			this.$devicePlatformsConstants.Android.toLowerCase(),
 		]);
diff --git a/lib/commands/debug.ts b/lib/commands/debug.ts
@@ -225,17 +225,12 @@ export class DebugAndroidCommand implements ICommand {
 		private $devicePlatformsConstants: Mobile.IDevicePlatformsConstants,
 		private $injector: IInjector,
 		private $projectData: IProjectData,
-		private $markingModeService: IMarkingModeService,
 		private $options: IOptions
 	) {
 		this.$projectData.initializeProjectData();
 	}
 
 	public async execute(args: string[]): Promise<void> {
-		await this.$markingModeService.handleMarkingModeFullDeprecation({
-			projectDir: this.$projectData.projectDir,
-			skipWarnings: true,
-		});
 		return this.debugPlatformCommand.execute(args);
 	}
 	public async canExecute(args: string[]): Promise<boolean> {
diff --git a/lib/commands/deploy.ts b/lib/commands/deploy.ts
@@ -36,7 +36,6 @@ export class DeployOnDeviceCommand
 		private $mobileHelper: Mobile.IMobileHelper,
 		$platformsDataService: IPlatformsDataService,
 		private $deployCommandHelper: DeployCommandHelper,
-		private $markingModeService: IMarkingModeService,
 		private $migrateController: IMigrateController
 	) {
 		super(
@@ -50,12 +49,6 @@ export class DeployOnDeviceCommand
 
 	public async execute(args: string[]): Promise<void> {
 		const platform = args[0];
-		if (this.$mobileHelper.isAndroidPlatform(platform)) {
-			await this.$markingModeService.handleMarkingModeFullDeprecation({
-				projectDir: this.$projectData.projectDir,
-				skipWarnings: true,
-			});
-		}
 
 		await this.$deployCommandHelper.deploy(platform);
 	}
diff --git a/lib/commands/prepare.ts b/lib/commands/prepare.ts
@@ -31,9 +31,7 @@ export class PrepareCommand
 		private $platformCommandParameter: ICommandParameter,
 		$platformsDataService: IPlatformsDataService,
 		private $prepareDataService: PrepareDataService,
-		private $migrateController: IMigrateController,
-		private $markingModeService: IMarkingModeService,
-		private $mobileHelper: Mobile.IMobileHelper
+		private $migrateController: IMigrateController
 	) {
 		super(
 			$options,
@@ -46,12 +44,6 @@ export class PrepareCommand
 
 	public async execute(args: string[]): Promise<void> {
 		const platform = args[0];
-		if (this.$mobileHelper.isAndroidPlatform(platform)) {
-			await this.$markingModeService.handleMarkingModeFullDeprecation({
-				projectDir: this.$projectData.projectDir,
-				skipWarnings: true,
-			});
-		}
 
 		const prepareData = this.$prepareDataService.getPrepareData(
 			this.$projectData.projectDir,
diff --git a/lib/commands/preview.ts b/lib/commands/preview.ts
@@ -21,18 +21,13 @@ export class PreviewCommand implements ICommand {
 		private $options: IOptions,
 		private $previewAppLogProvider: IPreviewAppLogProvider,
 		private $previewQrCodeService: IPreviewQrCodeService,
-		$cleanupService: ICleanupService,
-		private $markingModeService: IMarkingModeService
+		$cleanupService: ICleanupService
 	) {
 		this.$analyticsService.setShouldDispose(false);
 		$cleanupService.setShouldDispose(false);
 	}
 
 	public async execute(): Promise<void> {
-		await this.$markingModeService.handleMarkingModeFullDeprecation({
-			projectDir: this.$projectData.projectDir,
-			skipWarnings: true,
-		});
 		this.$previewAppLogProvider.on(
 			DEVICE_LOG_EVENT_NAME,
 			(deviceId: string, message: string) => {
diff --git a/lib/commands/run.ts b/lib/commands/run.ts
@@ -148,15 +148,10 @@ export class RunAndroidCommand implements ICommand {
 		private $injector: IInjector,
 		private $options: IOptions,
 		private $platformValidationService: IPlatformValidationService,
-		private $projectData: IProjectData,
-		private $markingModeService: IMarkingModeService
+		private $projectData: IProjectData
 	) {}
 
 	public async execute(args: string[]): Promise<void> {
-		await this.$markingModeService.handleMarkingModeFullDeprecation({
-			projectDir: this.$projectData.projectDir,
-			skipWarnings: true,
-		});
 		return this.runCommand.execute(args);
 	}
 
diff --git a/lib/commands/test.ts b/lib/commands/test.ts
@@ -155,17 +155,12 @@ class TestAndroidCommand extends TestCommandBase implements ICommand {
 		protected $cleanupService: ICleanupService,
 		protected $liveSyncCommandHelper: ILiveSyncCommandHelper,
 		protected $devicesService: Mobile.IDevicesService,
-		protected $migrateController: IMigrateController,
-		protected $markingModeService: IMarkingModeService
+		protected $migrateController: IMigrateController
 	) {
 		super();
 	}
 
 	public async execute(args: string[]): Promise<void> {
-		await this.$markingModeService.handleMarkingModeFullDeprecation({
-			projectDir: this.$projectData.projectDir,
-			skipWarnings: true,
-		});
 		await super.execute(args);
 	}
 
diff --git a/lib/controllers/prepare-controller.ts b/lib/controllers/prepare-controller.ts
@@ -12,10 +12,7 @@ import {
 	AnalyticsEventLabelDelimiter,
 	CONFIG_FILE_NAME_JS,
 	CONFIG_FILE_NAME_TS,
-	SCOPED_IOS_RUNTIME_NAME,
-	SCOPED_ANDROID_RUNTIME_NAME,
-	TNS_IOS_RUNTIME_NAME,
-	TNS_ANDROID_RUNTIME_NAME,
+	SupportedPlatform,
 } from "../constants";
 import {
 	IProjectDataService,
@@ -79,6 +76,14 @@ export class PrepareController extends EventEmitter {
 			await this.$markingModeService.handleMarkingModeFullDeprecation({
 				projectDir: projectData.projectDir,
 			});
+
+			this.$projectConfigService.writeLegacyNSConfigIfNeeded(
+				projectData.projectDir,
+				this.$projectDataService.getRuntimePackage(
+					projectData.projectDir,
+					prepareData.platform as SupportedPlatform
+				)
+			);
 		}
 
 		await this.trackRuntimeVersion(prepareData.platform, projectData);
@@ -443,32 +448,22 @@ export class PrepareController extends EventEmitter {
 		platform: string,
 		projectData: IProjectData
 	): Promise<void> {
-		let runtimeVersion: string = null;
-		try {
-			if (projectData.devDependencies) {
-				if (platform.toLowerCase() === "ios") {
-					runtimeVersion =
-						projectData.devDependencies[SCOPED_IOS_RUNTIME_NAME] ||
-						projectData.devDependencies[TNS_IOS_RUNTIME_NAME];
-				} else {
-					runtimeVersion =
-						projectData.devDependencies[SCOPED_ANDROID_RUNTIME_NAME] ||
-						projectData.devDependencies[TNS_ANDROID_RUNTIME_NAME];
-				}
-			}
-		} catch (err) {
+		const { version } = this.$projectDataService.getRuntimePackage(
+			projectData.projectDir,
+			platform as SupportedPlatform
+		);
+
+		if (!version) {
 			this.$logger.trace(
-				`Unable to get runtime version for project directory: ${projectData.projectDir} and platform ${platform}. Error is: `,
-				err
+				`Unable to get runtime version for project directory: ${projectData.projectDir} and platform ${platform}.`
 			);
+			return;
 		}
 
-		if (runtimeVersion) {
-			await this.$analyticsService.trackEventActionInGoogleAnalytics({
-				action: TrackActionNames.UsingRuntimeVersion,
-				additionalData: `${platform.toLowerCase()}${AnalyticsEventLabelDelimiter}${runtimeVersion}`,
-			});
-		}
+		await this.$analyticsService.trackEventActionInGoogleAnalytics({
+			action: TrackActionNames.UsingRuntimeVersion,
+			additionalData: `${platform.toLowerCase()}${AnalyticsEventLabelDelimiter}${version}`,
+		});
 	}
 }
 injector.register("prepareController", PrepareController);
diff --git a/lib/controllers/preview-app-controller.ts b/lib/controllers/preview-app-controller.ts
@@ -41,7 +41,6 @@ export class PreviewAppController
 		private $hmrStatusService: IHmrStatusService,
 		private $logger: ILogger,
 		public $hooksService: IHooksService,
-		private $mobileHelper: Mobile.IMobileHelper,
 		private $pluginsService: IPluginsService,
 		private $prepareController: PrepareController,
 		private $previewAppFilesService: IPreviewAppFilesService,
@@ -50,8 +49,7 @@ export class PreviewAppController
 		private $previewQrCodeService: IPreviewQrCodeService,
 		private $previewSdkService: IPreviewSdkService,
 		private $prepareDataService: PrepareDataService,
-		private $projectDataService: IProjectDataService,
-		private $markingModeService: IMarkingModeService
+		private $projectDataService: IProjectDataService
 	) {
 		super();
 	}
@@ -100,12 +98,6 @@ export class PreviewAppController
 		await this.$previewSdkService.initialize(
 			data.projectDir,
 			async (device: Device) => {
-				if (this.$mobileHelper.isAndroidPlatform(device.platform)) {
-					await this.$markingModeService.handleMarkingModeFullDeprecation({
-						projectDir: projectData.projectDir,
-					});
-				}
-
 				try {
 					if (!device) {
 						this.$errors.fail(
diff --git a/lib/definitions/project.d.ts b/lib/definitions/project.d.ts
@@ -315,6 +315,11 @@ interface IProjectConfigService {
 	getDefaultTSConfig(appId: string): string;
 
 	writeDefaultConfig(projectDir?: string, appId?: string): void;
+
+	writeLegacyNSConfigIfNeeded(
+		projectDir: string,
+		runtimePackage: IBasePluginData
+	): void;
 }
 
 interface IAssetItem {
diff --git a/lib/services/android/gradle-build-args-service.ts b/lib/services/android/gradle-build-args-service.ts
@@ -5,13 +5,15 @@ import { IAndroidToolsInfo } from "../../declarations";
 import { IAndroidBuildData } from "../../definitions/build";
 import { IHooksService, IAnalyticsService } from "../../common/declarations";
 import { injector } from "../../common/yok";
+import { IProjectData } from "../../definitions/project";
 
 export class GradleBuildArgsService implements IGradleBuildArgsService {
 	constructor(
 		private $androidToolsInfo: IAndroidToolsInfo,
 		private $hooksService: IHooksService,
 		private $analyticsService: IAnalyticsService,
 		private $staticConfig: Config.IStaticConfig,
+		private $projectData: IProjectData,
 		private $logger: ILogger
 	) {}
 
@@ -50,11 +52,17 @@ export class GradleBuildArgsService implements IGradleBuildArgsService {
 		const toolsInfo = this.$androidToolsInfo.getToolsInfo({
 			projectDir: buildData.projectDir,
 		});
+
+		// ensure we initialize project data
+		this.$projectData.initializeProjectData(buildData.projectDir);
+
 		args.push(
 			`-PcompileSdk=android-${toolsInfo.compileSdkVersion}`,
 			`-PtargetSdk=${toolsInfo.targetSdkVersion}`,
 			`-PbuildToolsVersion=${toolsInfo.buildToolsVersion}`,
-			`-PgenerateTypings=${toolsInfo.generateTypings}`
+			`-PgenerateTypings=${toolsInfo.generateTypings}`,
+			`-PappPath=${this.$projectData.getAppDirectoryPath()}`,
+			`-PappResourcesPath=${this.$projectData.getAppResourcesDirectoryPath()}`
 		);
 
 		if (buildData.release) {
diff --git a/lib/services/project-config-service.ts b/lib/services/project-config-service.ts
@@ -1,7 +1,7 @@
 import {
+	CONFIG_FILE_NAME_DISPLAY,
 	CONFIG_FILE_NAME_JS,
 	CONFIG_FILE_NAME_TS,
-	CONFIG_FILE_NAME_DISPLAY,
 } from "../constants";
 import * as path from "path";
 import * as _ from "lodash";
@@ -10,6 +10,8 @@ import { IFileSystem, IProjectHelper } from "../common/declarations";
 import { injector } from "../common/yok";
 import { INsConfig, IProjectConfigService } from "../definitions/project";
 import { IInjector } from "../common/definitions/yok";
+import { IBasePluginData } from "../definitions/plugins";
+import semver = require("semver/preload");
 
 export class ProjectConfigService implements IProjectConfigService {
 	constructor(
@@ -125,6 +127,37 @@ export default {
 
 		this.$fs.writeFile(configTSFilePath, this.getDefaultTSConfig(appId));
 	}
+
+	public writeLegacyNSConfigIfNeeded(
+		projectDir: string,
+		runtimePackage: IBasePluginData
+	) {
+		if (
+			runtimePackage.version &&
+			semver.gte(runtimePackage.version, "7.0.0-rc.5")
+		) {
+			return;
+		}
+		this.$logger.warn();
+		this.$logger.printMarkdown(`
+Using __${runtimePackage.name}${
+			runtimePackage.version ? "@" + runtimePackage.version : ""
+		}__ which requires \`nsconfig.json\` to be present.
+Writing \`nsconfig.json\` based on the values set in \`${CONFIG_FILE_NAME_DISPLAY}\`.
+You may add \`nsconfig.json\` to \`.gitignore\` as the CLI will regenerate it as necessary.`);
+		const nsConfigPath = path.join(
+			projectDir || this.projectHelper.projectDir,
+			"nsconfig.json"
+		);
+
+		this.$fs.writeJson(nsConfigPath, {
+			_info1: `Auto Generated for backwards compatibility with the currently used runtime.`,
+			_info2: `Do not edit this file manually, as any changes will be ignored.`,
+			_info3: `Config changes should be done in ${CONFIG_FILE_NAME_DISPLAY} instead.`,
+			appPath: this.getValue("appPath"),
+			appResourcesPath: this.getValue("appResourcesPath"),
+		});
+	}
 }
 
 injector.register("projectConfigService", ProjectConfigService);
diff --git a/test/package-installation-manager.ts b/test/package-installation-manager.ts
@@ -15,15 +15,14 @@ import * as yok from "../lib/common/yok";
 import ChildProcessLib = require("../lib/common/child-process");
 import { SettingsService } from "../lib/common/test/unit-tests/stubs";
 import { ProjectDataService } from "../lib/services/project-data-service";
-import { MarkingModeServiceStub, ProjectDataStub } from "./stubs";
+import { ProjectDataStub } from "./stubs";
 import { IInjector } from "../lib/common/definitions/yok";
 import * as _ from "lodash";
 import { IDictionary } from "../lib/common/declarations";
 
 function createTestInjector(): IInjector {
 	const testInjector = new yok.Yok();
 
-	testInjector.register("markingModeService", MarkingModeServiceStub);
 	testInjector.register("projectData", ProjectDataStub);
 	testInjector.register("config", ConfigLib.Configuration);
 	testInjector.register("logger", LoggerLib.Logger);
diff --git a/test/platform-commands.ts b/test/platform-commands.ts
@@ -21,7 +21,6 @@ import { Messages } from "../lib/common/messages/messages";
 import { SettingsService } from "../lib/common/test/unit-tests/stubs";
 import { PlatformValidationService } from "../lib/services/platform/platform-validation-service";
 import { PlatformCommandHelper } from "../lib/helpers/platform-command-helper";
-import { MarkingModeServiceStub } from "./stubs";
 import {
 	IPlatformData,
 	IBuildOutputOptions,
@@ -138,7 +137,6 @@ function createTestInjector() {
 	const testInjector = new yok.Yok();
 
 	testInjector.register("injector", testInjector);
-	testInjector.register("markingModeService", MarkingModeServiceStub);
 	testInjector.register("hooksService", stubs.HooksServiceStub);
 	testInjector.register("staticConfig", StaticConfigLib.StaticConfig);
 	testInjector.register("nodeModulesDependenciesBuilder", {});
diff --git a/test/services/android/gradle-build-args-service.ts b/test/services/android/gradle-build-args-service.ts
diff --git a/test/services/playground/preview-app-livesync-service.ts b/test/services/playground/preview-app-livesync-service.ts
diff --git a/test/services/project-data-service.ts b/test/services/project-data-service.ts
diff --git a/test/stubs.ts b/test/stubs.ts
diff --git a/test/update.ts b/test/update.ts
