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

Author: farfromrefug

lib/controllers/migrate-controller.ts

@@ -147,7 +147,7 @@ export class MigrateController
 		},
 		{
 			packageName: "nativescript-dev-webpack",
-			replaceWith: "@nativescript/webpack",
+			replaceWith: constants.WEBPACK_PLUGIN_NAME,
 			shouldRemove: true,
 			isDev: true,
 			async shouldMigrateAction() {
@@ -156,7 +156,7 @@ export class MigrateController
 			migrateAction: this.migrateWebpack.bind(this),
 		},
 		{
-			packageName: "@nativescript/webpack",
+			packageName: constants.WEBPACK_PLUGIN_NAME,
 			minVersion: "3.0.0",
 			desiredVersion: "~5.0.0",
 			shouldAddIfMissing: true,
@@ -1566,7 +1566,7 @@ export class MigrateController
 		);
 
 		try {
-			const scopedWebpackPackage = `@nativescript/webpack`;
+			const scopedWebpackPackage = constants.WEBPACK_PLUGIN_NAME;
 			const resolvedVersion =
 				await this.$packageInstallationManager.getMaxSatisfyingVersion(
 					scopedWebpackPackage,

lib/controllers/update-controller.ts

@@ -36,7 +36,7 @@ export class UpdateController
 
 		// devDependencies
 		{
-			packageName: "@nativescript/webpack",
+			packageName: constants.WEBPACK_PLUGIN_NAME,
 			isDev: true,
 		},
 		{

lib/definitions/project.d.ts

@@ -103,6 +103,7 @@ interface INsConfigPlaform {
 
 interface INsConfigIOS extends INsConfigPlaform {
 	discardUncaughtJsExceptions?: boolean;
+	runtimePackageName?: string
 }
 
 interface INSConfigVisionOS extends INsConfigIOS {}
@@ -143,6 +144,8 @@ interface INsConfigAndroid extends INsConfigPlaform {
 	enableMultithreadedJavascript?: boolean;
 
 	gradleVersion?: string;
+
+	runtimePackageName?: string
 }
 
 interface INsConfigHooks {
@@ -158,6 +161,7 @@ interface INsConfig {
 	buildPath?: string;
 	shared?: boolean;
 	overridePods?: string;
+	webpackPackageName?: string;
 	webpackConfigPath?: string;
 	ios?: INsConfigIOS;
 	android?: INsConfigAndroid;

lib/services/android-plugin-build-service.ts

@@ -457,10 +457,10 @@ export class AndroidPluginBuildService implements IAndroidPluginBuildService {
 
 	private async getLatestRuntimeVersion(): Promise<string> {
 		let runtimeVersion: string = null;
-
+		const packageName = this.$projectData.nsConfig.android?.runtimePackageName || SCOPED_ANDROID_RUNTIME_NAME;
 		try {
 			let result = await this.$packageManager.view(
-				SCOPED_ANDROID_RUNTIME_NAME,
+				packageName,
 				{
 					"dist-tags": true,
 				}
@@ -472,7 +472,7 @@ export class AndroidPluginBuildService implements IAndroidPluginBuildService {
 				`Error while getting latest android runtime version from view command: ${err}`
 			);
 			const registryData = await this.$packageManager.getRegistryPackageData(
-				SCOPED_ANDROID_RUNTIME_NAME
+				packageName
 			);
 			runtimeVersion = registryData["dist-tags"].latest;
 		}
@@ -496,9 +496,10 @@ export class AndroidPluginBuildService implements IAndroidPluginBuildService {
 			};
 		}
 
+		const packageName = this.$projectData.nsConfig.android?.runtimePackageName || SCOPED_ANDROID_RUNTIME_NAME;
 		// try reading from installed runtime first before reading from the npm registry...
 		const installedRuntimePackageJSONPath = resolvePackageJSONPath(
-			SCOPED_ANDROID_RUNTIME_NAME,
+			packageName,
 			{
 				paths: [this.$projectData.projectDir],
 			}
@@ -551,10 +552,11 @@ export class AndroidPluginBuildService implements IAndroidPluginBuildService {
 			return localVersionInfo;
 		}
 
+		const packageName = this.$projectData.nsConfig.android?.runtimePackageName || SCOPED_ANDROID_RUNTIME_NAME;
 		// fallback to reading from npm...
 		try {
 			let output = await this.$packageManager.view(
-				`${SCOPED_ANDROID_RUNTIME_NAME}@${runtimeVersion}`,
+				`${packageName}@${runtimeVersion}`,
 				{ version_info: true }
 			);
 			output = output?.["version_info"] ?? output;
@@ -569,7 +571,7 @@ export class AndroidPluginBuildService implements IAndroidPluginBuildService {
 				 *
 				 */
 				output = await this.$packageManager.view(
-					`${SCOPED_ANDROID_RUNTIME_NAME}@${runtimeVersion}`,
+					`${packageName}@${runtimeVersion}`,
 					{ gradle: true }
 				);
 				output = output?.["gradle"] ?? output;
@@ -589,7 +591,7 @@ export class AndroidPluginBuildService implements IAndroidPluginBuildService {
 				`Error while getting gradle data for android runtime from view command: ${err}`
 			);
 			const registryData = await this.$packageManager.getRegistryPackageData(
-				SCOPED_ANDROID_RUNTIME_NAME
+				packageName
 			);
 			runtimeGradleVersions = registryData.versions[runtimeVersion];
 		}

lib/services/project-data-service.ts

@@ -50,6 +50,7 @@ export class ProjectDataService implements IProjectDataService {
 		private $fs: IFileSystem,
 		private $staticConfig: IStaticConfig,
 		private $logger: ILogger,
+		private $projectData: IProjectData,
 		private $devicePlatformsConstants: Mobile.IDevicePlatformsConstants,
 		private $androidResourcesMigrationService: IAndroidResourcesMigrationService,
 		private $injector: IInjector
@@ -628,13 +629,15 @@ export class ProjectDataService implements IProjectDataService {
 			.getDependenciesFromPackageJson(projectDir)
 			.devDependencies.find((d) => {
 				if (platform === constants.PlatformTypes.ios) {
+					const packageName = this.$projectData.nsConfig.ios?.runtimePackageName || constants.SCOPED_IOS_RUNTIME_NAME;
 					return [
-						constants.SCOPED_IOS_RUNTIME_NAME,
+						packageName,
 						constants.TNS_IOS_RUNTIME_NAME,
 					].includes(d.name);
 				} else if (platform === constants.PlatformTypes.android) {
+					const packageName = this.$projectData.nsConfig.android?.runtimePackageName || constants.SCOPED_ANDROID_RUNTIME_NAME;
 					return [
-						constants.SCOPED_ANDROID_RUNTIME_NAME,
+						packageName,
 						constants.TNS_ANDROID_RUNTIME_NAME,
 					].includes(d.name);
 				} else if (platform === constants.PlatformTypes.visionos) {
@@ -687,12 +690,12 @@ export class ProjectDataService implements IProjectDataService {
 		);
 		if (platform === constants.PlatformTypes.ios) {
 			return {
-				name: constants.SCOPED_IOS_RUNTIME_NAME,
+				name: this.$projectData.nsConfig.ios?.runtimePackageName || constants.SCOPED_IOS_RUNTIME_NAME,
 				version: null,
 			};
 		} else if (platform === constants.PlatformTypes.android) {
 			return {
-				name: constants.SCOPED_ANDROID_RUNTIME_NAME,
+				name: this.$projectData.nsConfig.android?.runtimePackageName || constants.SCOPED_ANDROID_RUNTIME_NAME,
 				version: null,
 			};
 		} else if (platform === constants.PlatformTypes.visionos) {

lib/services/webpack/webpack-compiler-service.ts

@@ -599,7 +599,8 @@ export class WebpackCompilerService
 
 	private getWebpackExecutablePath(projectData: IProjectData): string {
 		if (this.isWebpack5(projectData)) {
-			const packagePath = resolvePackagePath("@nativescript/webpack", {
+			const packageName = projectData.nsConfig.webpackPackageName || WEBPACK_PLUGIN_NAME;
+			let packagePath = resolvePackagePath(packageName, {
 				paths: [projectData.projectDir],
 			});
 
@@ -620,7 +621,8 @@ export class WebpackCompilerService
 	}
 
 	private isWebpack5(projectData: IProjectData): boolean {
-		const packageJSONPath = resolvePackageJSONPath("@nativescript/webpack", {
+		const packageName = projectData.nsConfig.webpackPackageName || WEBPACK_PLUGIN_NAME;
+		const packageJSONPath = resolvePackageJSONPath(packageName, {
 			paths: [projectData.projectDir],
 		});
 

vendor/gradle-app/app/build.gradle

@@ -1027,9 +1027,7 @@ project.tasks.configureEach {
         name =~ /mergeBenchmark(Debug|Release)JavaResource/ || 
         name =~ /transform(Debug|Release)ClassesWithAsm/ || 
         // because of sentry plugin. There must be a better way
-        name =~ /collectExternal(Debug|Release)/ ||
-        name =~ /generateSentryProguardUuid(Debug|Release)/ || 
-        name =~ /generateSentryDebugMetaProperties(Debug|Release)/
+        name =~ /collectExternal(Debug|Release)/
         )) {
         it.finalizedBy(buildMetadata)
     }