Merge remote-tracking branch 'origin/main'

farfromrefug · farfromrefug · commit b5ca637c5c39 · 2026-03-24T15:56:25.000+01:00
diff --git a/lib/common/dispatchers.ts b/lib/common/dispatchers.ts
@@ -121,18 +121,18 @@ export class CommandDispatcher implements ICommandDispatcher {
 
 		switch (packageManagerName) {
 			case PackageManagers.yarn:
-			case PackageManagers.yarn2:
-				updateCommand = "yarn global add nativescript";
+			// case PackageManagers.yarn2:
+				updateCommand = "yarn global add @akylas/nativescript-cli";
 				break;
 			case PackageManagers.pnpm:
-				updateCommand = "pnpm i -g nativescript";
+				updateCommand = "pnpm i -g @akylas/nativescript-cli";
 				break;
 			case PackageManagers.bun:
-				updateCommand = "bun add --global nativescript";
+				updateCommand = "bun add --global @akylas/nativescript-cli";
 				break;
 			case PackageManagers.npm:
 			default:
-				updateCommand = "npm i -g nativescript";
+				updateCommand = "npm i -g @akylas/nativescript-cli";
 				break;
 		}
 
diff --git a/lib/constants.ts b/lib/constants.ts
@@ -8,7 +8,7 @@ export const APP_FOLDER_NAME = "app";
 export const APP_RESOURCES_FOLDER_NAME = "App_Resources";
 export const PROJECT_FRAMEWORK_FOLDER_NAME = "framework";
 export const NS_BASE_PODFILE = "NSPodfileBase";
-export const NATIVESCRIPT_KEY_NAME = "nativescript";
+export const NATIVESCRIPT_KEY_NAME = "@akylas/nativescript-cli";
 export const NODE_MODULES_FOLDER_NAME = "node_modules";
 export const TNS_MODULES_FOLDER_NAME = "tns_modules";
 export const TNS_CORE_MODULES_NAME = "tns-core-modules";
diff --git a/lib/controllers/prepare-controller.ts b/lib/controllers/prepare-controller.ts
@@ -407,7 +407,7 @@ export class PrepareController extends EventEmitter {
 		const dependencies = this.$nodeModulesDependenciesBuilder
 			.getProductionDependencies(
 				projectData.projectDir,
-				projectData.ignoredDependencies,
+				projectData.getIgnoredDependencies(platformData.platformNameLowerCase),
 			)
 			.filter((dep) => dep.nativescript);
 		const pluginsNativeDirectories = dependencies.map((dep) =>
@@ -457,7 +457,7 @@ export class PrepareController extends EventEmitter {
 		);
 
 
-		const {hooks, ignoredNativeDependencies, webpackPackageName, webpackConfigPath, appResourcesPath, buildPath, appPath, ...nsConfig} = this.$projectConfigService.readConfig(
+		const {hooks, webpackPackageName, webpackConfigPath, appResourcesPath, buildPath, appPath, ...nsConfig} = this.$projectConfigService.readConfig(
 			projectData.projectDir
 		);
 
diff --git a/lib/definitions/gradle.d.ts b/lib/definitions/gradle.d.ts
@@ -30,4 +30,5 @@ interface IGradleBuildService {
 interface IGradleBuildArgsService {
 	getBuildTaskArgs(buildData: IAndroidBuildData): Promise<string[]>;
 	getCleanTaskArgs(buildData: IAndroidBuildData): string[];
+	getBuildLoggingArgs(): string[];
 }
diff --git a/lib/definitions/project.d.ts b/lib/definitions/project.d.ts
@@ -126,6 +126,7 @@ export type BundlerType = "webpack" | "rspack" | "vite";
 interface INsConfigIOS extends INsConfigPlaform {
 	discardUncaughtJsExceptions?: boolean;
 	runtimePackageName?: string
+	ignoredNativeDependencies?: string[];
 	cocoapodUseBundleExec?: boolean
 	/**
 	 * Swift Package Manager
@@ -175,9 +176,11 @@ interface INsConfigAndroid extends INsConfigPlaform {
 
 	gradleArgs?: string[];
 
-	plugins?:{ [k:string]: { aarSuffix?: string } }
+	plugins?:{ [k:string]: { aarSuffix?: string } };
 
-	runtimePackageName?: string
+	runtimePackageName?: string;
+
+	ignoredNativeDependencies?: string[];
 }
 
 interface INsConfigHooks {
@@ -212,7 +215,6 @@ interface IProjectData extends ICreateProjectData {
 	projectId: string;
 	projectIdentifiers?: Mobile.IProjectIdentifier;
 	dependencies: any;
-	ignoredDependencies?: string[];
 	devDependencies: IStringDictionary;
 	appDirectoryPath: string;
 	appResourcesDirectoryPath: string;
@@ -270,6 +272,7 @@ interface IProjectData extends ICreateProjectData {
 	getAppResourcesDirectoryPath(projectDir?: string): string;
 	getAppResourcesRelativeDirectoryPath(): string;
 	getBuildRelativeDirectoryPath(): string;
+	getIgnoredDependencies(platform: string): string[];
 }
 
 interface IProjectDataService {
diff --git a/lib/project-data.ts b/lib/project-data.ts
@@ -90,7 +90,6 @@ export class ProjectData implements IProjectData {
 	public appResourcesDirectoryPath: string;
 	public dependencies: any;
 	public devDependencies: IStringDictionary;
-	public ignoredDependencies: string[];
 	public projectType: string;
 	public androidManifestPath: string;
 	public infoPlistPath: string;
@@ -180,7 +179,6 @@ export class ProjectData implements IProjectData {
 			this.dependencies = packageJsonData.dependencies;
 			this.devDependencies = packageJsonData.devDependencies;
 			this.projectType = this.getProjectType();
-			this.ignoredDependencies = nsConfig?.ignoredNativeDependencies;
 			this.appDirectoryPath = this.getAppDirectoryPath();
 			this.appResourcesDirectoryPath = this.getAppResourcesDirectoryPath();
 			this.androidManifestPath = this.getPathToAndroidManifest(
@@ -359,6 +357,18 @@ export class ProjectData implements IProjectData {
 		return identifier;
 	}
 
+	getIgnoredDependencies(platform: string) {
+		let ignoredNativeDependencies = this.nsConfig?.ignoredNativeDependencies ?? [];
+		if (platform === constants.PlatformTypes.visionos) {
+			ignoredNativeDependencies = ignoredNativeDependencies.concat(this.nsConfig?.visionos?.ignoredNativeDependencies ?? [])
+		} else if (platform === constants.PlatformTypes.ios) {
+			ignoredNativeDependencies = ignoredNativeDependencies.concat(this.nsConfig?.ios?.ignoredNativeDependencies ?? [])
+		} else if (platform === constants.PlatformTypes.android) {
+			ignoredNativeDependencies = ignoredNativeDependencies.concat(this.nsConfig?.android?.ignoredNativeDependencies ?? [])
+		}
+		return ignoredNativeDependencies;
+	}
+
 	private getProjectType(): string {
 		let detectedProjectType = _.find(
 			ProjectData.PROJECT_TYPES,
diff --git a/lib/services/android-plugin-build-service.ts b/lib/services/android-plugin-build-service.ts
@@ -39,6 +39,7 @@ import { injector } from "../common/yok";
 import * as _ from "lodash";
 import { resolvePackageJSONPath } from "@rigor789/resolve-package-path";
 import { cwd } from "process";
+import { IGradleBuildArgsService } from "../definitions/gradle";
 
 export class AndroidPluginBuildService implements IAndroidPluginBuildService {
 	private get $platformsDataService(): IPlatformsDataService {
@@ -56,6 +57,7 @@ export class AndroidPluginBuildService implements IAndroidPluginBuildService {
 		private $projectData: IProjectData,
 		private $projectDataService: IProjectDataService,
 		private $devicePlatformsConstants: Mobile.IDevicePlatformsConstants,
+		private $gradleBuildArgsService: IGradleBuildArgsService,
 		private $errors: IErrors,
 		private $filesHashService: IFilesHashService,
 		public $hooksService: IHooksService,
@@ -812,10 +814,8 @@ export class AndroidPluginBuildService implements IAndroidPluginBuildService {
 			});
 			localArgs.push(...additionalArgs);
 		}
+		localArgs.push(...this.$gradleBuildArgsService.getBuildLoggingArgs());
 
-		if (this.$logger.getLevel() === "INFO") {
-			localArgs.push("--info");
-		}
 
 		const opts: any = {
 			cwd: pluginBuildSettings.pluginDir,
diff --git a/lib/services/android/gradle-build-args-service.ts b/lib/services/android/gradle-build-args-service.ts
@@ -57,7 +57,6 @@ export class GradleBuildArgsService implements IGradleBuildArgsService {
 		this.$projectData.initializeProjectData(buildData.projectDir);
 
 		args.push(
-			`--stacktrace`,
 			`-PcompileSdk=${toolsInfo.compileSdkVersion}`,
 			`-PtargetSdk=${toolsInfo.targetSdkVersion}`,
 			`-PbuildToolsVersion=${toolsInfo.buildToolsVersion}`,
@@ -92,18 +91,23 @@ export class GradleBuildArgsService implements IGradleBuildArgsService {
 				`-PksPassword=${buildData.keyStorePassword}`
 			);
 		}
+		console.log('getBuildTaskArgs', args);
 
 		return args;
 	}
 
-	private getBuildLoggingArgs(): string[] {
+	public getBuildLoggingArgs(): string[] {
 		const args = [];
 
 		const logLevel = this.$logger.getLevel();
 		if (logLevel === LoggerLevel.TRACE) {
+			args.push("--stacktrace");
 			args.push("--debug");
 		} else if (logLevel === LoggerLevel.DEBUG) {
+			args.push("--stacktrace");
 			args.push("--info");
+		} else if (logLevel === LoggerLevel.INFO) {
+			args.push("--quiet");
 		}
 
 		return args;
diff --git a/lib/services/plugins-service.ts b/lib/services/plugins-service.ts
@@ -352,7 +352,7 @@ export class PluginsService implements IPluginsService {
 			dependencies ||
 			this.$nodeModulesDependenciesBuilder.getProductionDependencies(
 				projectData.projectDir,
-				projectData.ignoredDependencies
+				projectData.getIgnoredDependencies(platform)
 			);
 
 		if (_.isEmpty(dependencies)) {
diff --git a/lib/services/project-changes-service.ts b/lib/services/project-changes-service.ts
@@ -109,7 +109,7 @@ export class ProjectChangesService implements IProjectChangesService {
 			this.$nodeModulesDependenciesBuilder
 				.getProductionDependencies(
 					projectData.projectDir,
-					projectData.ignoredDependencies
+					projectData.getIgnoredDependencies(platformData.platformNameLowerCase)
 				)
 				.filter(
 					(dep) =>
diff --git a/lib/tools/node-modules/node-modules-builder.ts b/lib/tools/node-modules/node-modules-builder.ts
@@ -20,7 +20,7 @@ export class NodeModulesBuilder implements INodeModulesBuilder {
 	}: IPrepareNodeModulesData): Promise<void> {
 		let dependencies = this.$nodeModulesDependenciesBuilder.getProductionDependencies(
 			projectData.projectDir,
-			projectData.ignoredDependencies
+			projectData.getIgnoredDependencies(platformData.platformNameLowerCase)
 		);
 		dependencies = await platformData.platformProjectService.beforePrepareAllPlugins(
 			projectData,
diff --git a/test/stubs.ts b/test/stubs.ts
@@ -654,7 +654,6 @@ export class ProjectConfigServiceStub implements IProjectConfigService {
 }
 
 export class ProjectDataStub implements IProjectData {
-	ignoredDependencies?: string[];
 	initialized?: boolean;
 	packageJsonData: any;
 	projectDir: string;
@@ -663,6 +662,10 @@ export class ProjectDataStub implements IProjectData {
 	bundlerConfigPath: string;
 	bundler: BundlerType;
 
+	getIgnoredDependencies(platform: string): string[] {
+		return [];
+	}
+
 	get platformsDir(): string {
 		return (
 			this.platformsDirCache ||
diff --git a/vendor/gradle-plugin/build.gradle b/vendor/gradle-plugin/build.gradle
@@ -191,6 +191,10 @@ buildscript {
         def pluginData = appDependencies.find { it.name == project.ext.PLUGIN_NAME }
         project.ext.nativescriptDependencies = appDependencies.findAll{pluginData.dependencies.contains(it.name)}.plus([pluginData])
     }
+
+    initialize()
+    project.ext.applyBeforePluginGradleConfiguration()
+
     def applyBuildScriptConfigurations = { ->
         def absolutePathToAppResources = project.ext.getAppResourcesPath()
         def pathToBuildScriptGradle = "$absolutePathToAppResources/Android/buildscript.gradle"
@@ -223,8 +227,6 @@ buildscript {
         }
     }
 
-    initialize()
-    project.ext.applyBeforePluginGradleConfiguration()
     applyBuildScriptConfigurations()
 
     def computeKotlinVersion = { -> project.hasProperty("kotlinVersion") ? kotlinVersion : "${ns_default_kotlin_version}" }

Original file line number	Diff line number	Diff line change
`@@ -30,4 +30,5 @@ interface IGradleBuildService {`
`30`	`30`	`interface IGradleBuildArgsService {`
`31`	`31`	`getBuildTaskArgs(buildData: IAndroidBuildData): Promise<string[]>;`
`32`	`32`	`getCleanTaskArgs(buildData: IAndroidBuildData): string[];`
	`33`	`+ getBuildLoggingArgs(): string[];`
`33`	`34`	`}`
Original file line number	Diff line number	Diff line change
`@@ -109,7 +109,7 @@ export class ProjectChangesService implements IProjectChangesService {`
`109`	`109`	`this.$nodeModulesDependenciesBuilder`
`110`	`110`	`.getProductionDependencies(`
`111`	`111`	`projectData.projectDir,`
`112`		`- projectData.ignoredDependencies`
	`112`	`+ projectData.getIgnoredDependencies(platformData.platformNameLowerCase)`
`113`	`113`	`)`
`114`	`114`	`.filter(`
`115`	`115`	`(dep) =>`