Merge branch 'main' of github.com:farfromrefug/nativescript-cli

Author: farfromrefug

lib/controllers/prepare-controller.ts

@@ -17,7 +17,10 @@ import {
 	CONFIG_FILE_NAME_TS,
 	PACKAGE_JSON_FILE_NAME,
 	PLATFORMS_DIR_NAME,
+	PlatformTypes,
 	PREPARE_READY_EVENT_NAME,
+	SCOPED_ANDROID_RUNTIME_NAME,
+	SCOPED_IOS_RUNTIME_NAME,
 	SupportedPlatform,
 	TrackActionNames,
 	WEBPACK_COMPILATION_COMPLETE,
@@ -36,6 +39,7 @@ import {
 	IProjectDataService,
 	IProjectService,
 } from "../definitions/project";
+import { resolvePackageJSONPath } from "@rigor789/resolve-package-path";
 
 interface IPlatformWatcherData {
 	hasWebpackCompilerProcess: boolean;
@@ -449,30 +453,72 @@ export class PrepareController extends EventEmitter {
 		this.$logger.info(
 			"Updating runtime package.json with configuration values..."
 		);
-		const nsConfig = this.$projectConfigService.readConfig(
+
+
+		const {hooks, ignoredNativeDependencies, webpackPackageName, webpackConfigPath, appResourcesPath, buildPath, appPath, ...nsConfig} = this.$projectConfigService.readConfig(
 			projectData.projectDir
 		);
+
+		const platform = platformData.platformNameLowerCase;
+		let installedRuntimePackageJSON;
+		let runtimePackageName: string;
+		if (platform === PlatformTypes.ios) {
+			runtimePackageName = projectData.nsConfig.ios?.runtimePackageName || SCOPED_IOS_RUNTIME_NAME;
+		} else if (platform === PlatformTypes.android) {
+			runtimePackageName = projectData.nsConfig.android?.runtimePackageName || SCOPED_ANDROID_RUNTIME_NAME;
+		}
+		// try reading from installed runtime first before reading from the npm registry...
+		const installedRuntimePackageJSONPath = resolvePackageJSONPath(
+			runtimePackageName,
+			{
+				paths: [projectData.projectDir],
+			}
+		);
+
+		if (installedRuntimePackageJSONPath) {
+			installedRuntimePackageJSON = this.$fs.readJson(
+				installedRuntimePackageJSONPath
+			);
+		}
 		const packageData: any = {
 			..._.pick(projectData.packageJsonData, ["name"]),
 			...nsConfig,
 			main: "bundle",
+			...(installedRuntimePackageJSON? {}:{})
 		};
-
 		if (
-			platformData.platformNameLowerCase === "ios" &&
-			packageData.ios &&
-			packageData.ios.discardUncaughtJsExceptions
+			platform === PlatformTypes.ios
 		) {
-			packageData.discardUncaughtJsExceptions =
+			if (installedRuntimePackageJSON) {
+				packageData.ios = packageData.ios || {};
+				packageData.ios.runtime = {
+					version: installedRuntimePackageJSON.version
+				};
+			}
+			if (packageData.ios &&
+				packageData.ios.discardUncaughtJsExceptions) {
+				packageData.discardUncaughtJsExceptions =
 				packageData.ios.discardUncaughtJsExceptions;
+			}
+			delete packageData.android;
 		}
 		if (
-			platformData.platformNameLowerCase === "android" &&
-			packageData.android &&
-			packageData.android.discardUncaughtJsExceptions
+			platform === PlatformTypes.android
 		) {
-			packageData.discardUncaughtJsExceptions =
-				packageData.android.discardUncaughtJsExceptions;
+			if (installedRuntimePackageJSON) {
+				packageData.android = packageData.android || {};
+				packageData.android.runtime = {
+					version: installedRuntimePackageJSON.version,
+					version_info: installedRuntimePackageJSON.version_info,
+					gradle:installedRuntimePackageJSON.gradle
+				};
+			}
+			if (packageData.android &&
+				packageData.android.discardUncaughtJsExceptions) {
+				packageData.discardUncaughtJsExceptions =
+					packageData.android.discardUncaughtJsExceptions;
+			}
+			delete packageData.ios;
 		}
 		let packagePath: string;
 		if (