Merge remote-tracking branch 'nativescript/main'

# Conflicts:
#	CHANGELOG.md
#	lib/services/webpack/webpack-compiler-service.ts
#	package-lock.json
#	package.json

Author: farfromrefug

lib/commands/appstore-upload.ts

@@ -54,8 +54,8 @@ export class PublishIOS implements ICommand {
 		const user = await this.$applePortalSessionService.createUserSession(
 			{ username, password },
 			{
-				applicationSpecificPassword: this.$options
-					.appleApplicationSpecificPassword,
+				applicationSpecificPassword:
+					this.$options.appleApplicationSpecificPassword,
 				sessionBase64: this.$options.appleSessionBase64,
 				requireInteractiveConsole: true,
 				requireApplicationSpecificPassword: true,
@@ -91,14 +91,12 @@ export class PublishIOS implements ICommand {
 						mobileProvisionIdentifier
 				);
 
-				// As we need to build the package for device
-				this.$options.forDevice = true;
 				this.$options.provision = mobileProvisionIdentifier;
 
 				const buildData = new IOSBuildData(
 					this.$projectData.projectDir,
 					platform,
-					{ ...this.$options.argv, watch: false }
+					{ ...this.$options.argv, buildForAppStore: true, watch: false }
 				);
 				ipaFilePath = await this.$buildController.prepareAndBuild(buildData);
 			} else {
@@ -118,8 +116,8 @@ export class PublishIOS implements ICommand {
 		await this.$itmsTransporterService.upload({
 			credentials: { username, password },
 			user,
-			applicationSpecificPassword: this.$options
-				.appleApplicationSpecificPassword,
+			applicationSpecificPassword:
+				this.$options.appleApplicationSpecificPassword,
 			ipaFilePath,
 			shouldExtractIpa: !!this.$options.ipa,
 			verboseLogging: this.$logger.getLevel() === "TRACE",

lib/commands/create-project.ts

@@ -203,7 +203,7 @@ export class CreateProjectCommand implements ICommand {
 			this.$logger.printMarkdown(`# Let’s create a NativeScript app!`);
 			this.$logger.printMarkdown(`
 Answer the following questions to help us build the right app for you. (Note: you
-can skip this prompt next time using the --template option, or the --ng, --react, --vue, --svelte, --ts, or --js flags.)
+can skip this prompt next time using the --template option, or using --ng, --react, --solid, --svelte, --vue, --ts, or --js flags.)
 `);
 		}
 	}
@@ -366,6 +366,11 @@ can skip this prompt next time using the --template option, or the --ng, --react
 				value: constants.RESERVED_TEMPLATE_NAMES.solid,
 				description: CreateProjectCommand.HelloWorldTemplateDescription,
 			},
+			{
+				key: `${CreateProjectCommand.HelloWorldTemplateKey} using TypeScript`,
+				value: constants.RESERVED_TEMPLATE_NAMES.solidts,
+				description: `${CreateProjectCommand.HelloWorldTemplateDescription} using TypeScript`,
+			},
 			{
 				key: CreateProjectCommand.BlankVisionTemplateKey,
 				value: "@nativescript/template-blank-solid-vision",

lib/common/mobile/android/android-ini-file-parser.ts

@@ -20,26 +20,28 @@ export class AndroidIniFileParser implements Mobile.IAndroidIniFileParser {
 			contents,
 			(result: Mobile.IAvdInfo, line: string) => {
 				const parsedLine = line.split("=");
-				const key = parsedLine[0];
+
+				const key = parsedLine[0]?.trim();
+				const value = parsedLine[1]?.trim();
 				switch (key) {
 					case "target":
-						result.target = parsedLine[1];
+						result.target = value;
 						result.targetNum = this.readTargetNum(result.target);
 						break;
 					case "path":
 					case "AvdId":
-						result[_.lowerFirst(key)] = parsedLine[1];
+						result[_.lowerFirst(key)] = value;
 						break;
 					case "hw.device.name":
-						result.device = parsedLine[1];
+						result.device = value;
 						break;
 					case "avd.ini.displayname":
-						result.displayName = parsedLine[1];
+						result.displayName = value;
 						break;
 					case "abi.type":
 					case "skin.name":
 					case "sdcard.size":
-						result[key.split(".")[0]] = parsedLine[1];
+						result[key.split(".")[0]] = value;
 						break;
 				}
 				return result;

lib/common/mobile/android/logcat-helper.ts

@@ -231,7 +231,7 @@ export class LogcatHelper implements Mobile.ILogcatHelper {
 		];
 
 		if (appId) {
-			logcatCommand.push(`--regex=START.*${appId}`);
+			logcatCommand.push(`--regex=Start.*${appId}`);
 		}
 
 		const appStartTrackingStream = await adb.executeCommand(logcatCommand, {

lib/constants.ts

@@ -147,6 +147,7 @@ export const RESERVED_TEMPLATE_NAMES: IStringDictionary = {
 	reactjs: "@nativescript/template-blank-react",
 	solid: "@nativescript/template-blank-solid",
 	solidjs: "@nativescript/template-blank-solid",
+	solidts: "@nativescript/template-blank-solid-ts",
 	svelte: "@nativescript/template-blank-svelte",
 	// vision templates
 	vision: "@nativescript/template-hello-world-ts-vision",

lib/controllers/prepare-controller.ts

@@ -198,7 +198,7 @@ export class PrepareController extends EventEmitter {
 			};
 		}
 
-		await this.writeRuntimePackageJson(projectData, platformData);
+		await this.writeRuntimePackageJson(projectData, platformData, prepareData);
 
 		await this.$projectChangesService.savePrepareInfo(
 			platformData,
@@ -441,7 +441,8 @@ export class PrepareController extends EventEmitter {
 	 */
 	public async writeRuntimePackageJson(
 		projectData: IProjectData,
-		platformData: IPlatformData
+		platformData: IPlatformData,
+		prepareData: IPrepareData = null
 	) {
 		const configInfo = this.$projectConfigService.detectProjectConfigs(
 			projectData.projectDir
@@ -559,6 +560,10 @@ export class PrepareController extends EventEmitter {
 			);
 		}
 
+		if (prepareData?.uniqueBundle) {
+			packageData.main = `${packageData.main}.${prepareData.uniqueBundle}`;
+		}
+
 		this.$fs.writeJson(packagePath, packageData);
 	}
 

lib/data/prepare-data.ts

@@ -9,6 +9,7 @@ export class PrepareData extends ControllerDataBase {
 	public watch?: boolean;
 	public watchNative: boolean = true;
 	public hostProjectPath?: string;
+	public uniqueBundle: number;
 
 	constructor(
 		public projectDir: string,
@@ -43,6 +44,8 @@ export class PrepareData extends ControllerDataBase {
 			this.watchNative = data.watchNative;
 		}
 		this.hostProjectPath = data.hostProjectPath;
+
+		this.uniqueBundle = !this.watch && data.uniqueBundle ? Date.now() : 0;
 	}
 }
 

lib/declarations.d.ts

@@ -711,7 +711,7 @@ interface IOptions
 	dryRun: boolean;
 
 	platformOverride: string;
-
+	uniqueBundle: boolean;
 	// allow arbitrary options
 	[optionName: string]: any;
 }

lib/definitions/prepare.d.ts

@@ -14,6 +14,8 @@ declare global {
 
 		// embedding
 		hostProjectPath?: string;
+
+		uniqueBundle: number;
 	}
 
 	interface IiOSCodeSigningData {

lib/key-commands/index.ts

@@ -50,6 +50,34 @@ export class ShiftA implements IKeyCommand {
 		private $projectData: IProjectData
 	) {}
 
+	getAndroidStudioPath(): string | null {
+		const os = currentPlatform();
+
+		if (os === "darwin") {
+			const possibleStudioPaths = [
+				"/Applications/Android Studio.app",
+				`${process.env.HOME}/Applications/Android Studio.app`,
+			];
+
+			return possibleStudioPaths.find((p) => fs.existsSync(p)) || null;
+		} else if (os === "win32") {
+			const studioPath = path.join(
+				"C:",
+				"Program Files",
+				"Android",
+				"Android Studio",
+				"bin",
+				"studio64.exe"
+			);
+			return fs.existsSync(studioPath) ? studioPath : null;
+		} else if (os === "linux") {
+			const studioPath = "/usr/local/android-studio/bin/studio.sh";
+			return fs.existsSync(studioPath) ? studioPath : null;
+		}
+
+		return null;
+	}
+
 	async execute(): Promise<void> {
 		this.$liveSyncCommandHelper.validatePlatform(this.platform);
 		this.$projectData.initializeProjectData();
@@ -65,53 +93,32 @@ export class ShiftA implements IKeyCommand {
 			}
 		}
 
-		const os = currentPlatform();
+		let studioPath = null;
 
-		if (os === "darwin") {
-			const possibleStudioPaths = [
-				"/Applications/Android Studio.app",
-				`${process.env.HOME}/Applications/Android Studio.app`,
-			];
+		studioPath = process.env.NATIVESCRIPT_ANDROID_STUDIO_PATH;
 
-			const studioPath = possibleStudioPaths.find((p) => {
-				this.$logger.trace(`Checking for Android Studio at ${p}`);
-				return fs.existsSync(p);
-			});
+		if (!studioPath) {
+			studioPath = this.getAndroidStudioPath();
 
 			if (!studioPath) {
 				this.$logger.error(
-					"Android Studio is not installed, or not in a standard location."
+					"Android Studio is not installed, or is not in a standard location. Use NATIVESCRIPT_ANDROID_STUDIO_PATH."
 				);
 				return;
 			}
+		}
+
+		const os = currentPlatform();
+		if (os === "darwin") {
 			this.$childProcess.exec(`open -a "${studioPath}" ${androidDir}`);
 		} else if (os === "win32") {
-			const studioPath = path.join(
-				"C:",
-				"Program Files",
-				"Android",
-				"Android Studio",
-				"bin",
-				"studio64.exe"
-			);
-			if (!fs.existsSync(studioPath)) {
-				this.$logger.error("Android Studio is not installed");
-				return;
-			}
-
 			const child = this.$childProcess.spawn(studioPath, [androidDir], {
 				detached: true,
 				stdio: "ignore",
 			});
 			child.unref();
 		} else if (os === "linux") {
-			if (!fs.existsSync(`/usr/local/android-studio/bin/studio.sh`)) {
-				this.$logger.error("Android Studio is not installed");
-				return;
-			}
-			this.$childProcess.exec(
-				`/usr/local/android-studio/bin/studio.sh ${androidDir}`
-			);
+			this.$childProcess.exec(`${studioPath} ${androidDir}`);
 		}
 	}
 }