Merge remote-tracking branch 'nativescript/main'

# Conflicts:
#	lib/base-package-manager.ts
#	lib/controllers/build-controller.ts
#	lib/nativescript-cli.ts
#	lib/package-installation-manager.ts
#	lib/package-manager.ts
#	lib/services/android-plugin-build-service.ts
#	lib/services/device/device-install-app-service.ts
#	lib/services/timeline-profiler-service.ts
#	lib/yarn2-package-manager.ts
#	package-lock.json
#	package.json
#	yarn.lock

Author: farfromrefug

.github/workflows/npm_release_cli.yml

@@ -2,7 +2,7 @@ name: 'nativescript -> npm'
 
 on:
   push:
-    branches: [ 'master' ]
+    branches: [ 'main' ]
     paths-ignore:
       - 'packages/**'
   workflow_dispatch:

.github/workflows/npm_release_doctor.yml

@@ -2,7 +2,7 @@ name: '@nativescript/doctor -> npm'
 
 on:
   push:
-    branches: [ 'master' ]
+    branches: [ 'main' ]
     paths:
       - 'packages/doctor/**'
   workflow_dispatch:

CHANGELOG.md

@@ -1,3 +1,74 @@
+## [8.5.3](https://github.com/NativeScript/nativescript-cli/compare/v8.5.2...v8.5.3) (2023-04-12)
+
+
+### Bug Fixes
+
+* correctly merge IPHONEOS_DEPLOYMENT_TARGET in xcconfigs ([#5728](https://github.com/NativeScript/nativescript-cli/issues/5728)) ([e6c09c0](https://github.com/NativeScript/nativescript-cli/commit/e6c09c0048534f6079634291706b0b38ac193a6c))
+* hooks not being called ([#5729](https://github.com/NativeScript/nativescript-cli/issues/5729)) ([c35673e](https://github.com/NativeScript/nativescript-cli/commit/c35673eb9ed02116e1286351ca7a711d6ee231e7))
+* migrate - safeguard possibly null values ([#5730](https://github.com/NativeScript/nativescript-cli/issues/5730)) ([68d9373](https://github.com/NativeScript/nativescript-cli/commit/68d9373aec1427a71e1f6236fff4f8084c33a421))
+
+
+
+## [8.5.2](https://github.com/NativeScript/nativescript-cli/compare/v8.5.1...v8.5.2) (2023-04-06)
+
+
+### Features
+
+* clean multiple projects ([#5726](https://github.com/NativeScript/nativescript-cli/issues/5726)) ([e39e8db](https://github.com/NativeScript/nativescript-cli/commit/e39e8dbea725bbb541c9f76fc7b8723bf204d423))
+
+
+
+## [8.5.1](https://github.com/NativeScript/nativescript-cli/compare/v8.5.0...v8.5.1) (2023-03-29)
+
+
+### Reverts
+
+* "fix: build plugins using same gradle config structure as apps ([#5671](https://github.com/NativeScript/nativescript-cli/issues/5671))" ([2c2c964](https://github.com/NativeScript/nativescript-cli/commit/2c2c964c791a831f091a5a10432d4b9f6266e5d4))
+
+
+
+# [8.5.0](https://github.com/NativeScript/nativescript-cli/compare/v8.4.0...v8.5.0) (2023-03-28)
+
+
+### Bug Fixes
+
+* **publish:** various apple publish/sign-in fixes ([#5718](https://github.com/NativeScript/nativescript-cli/issues/5718)) ([1c27c2b](https://github.com/NativeScript/nativescript-cli/commit/1c27c2bf17a7df1fcfa434b7c04fda3a41f38a34))
+* build plugins using same gradle config structure as apps ([#5671](https://github.com/NativeScript/nativescript-cli/issues/5671)) ([40e459a](https://github.com/NativeScript/nativescript-cli/commit/40e459ac2669bed5a1b661f47336691cc8d0b997))
+* **android:** support unsigned apks ([#5706](https://github.com/NativeScript/nativescript-cli/issues/5706)) ([32d3a0f](https://github.com/NativeScript/nativescript-cli/commit/32d3a0fe4a83943c2580b42c1e1536236a3d6164))
+* **doctor:** check for python3 instead of python ([f21156c](https://github.com/NativeScript/nativescript-cli/commit/f21156c8d02964308f503dcdf8f9dc2764745b4e))
+
+
+### Features
+
+* **migrate:** 8.5.0 migrations ([#5725](https://github.com/NativeScript/nativescript-cli/issues/5725)) ([b11357d](https://github.com/NativeScript/nativescript-cli/commit/b11357d1c1c7ee717acd43fbccee568367d77016))
+* support generating android adaptive icons ([#5667](https://github.com/NativeScript/nativescript-cli/issues/5667)) ([73694bd](https://github.com/NativeScript/nativescript-cli/commit/73694bd447625f3df91f999c66e13e9ddc6fb01e))
+* **profiling:** generate chrome compatible timeline data ([#5686](https://github.com/NativeScript/nativescript-cli/issues/5686)) ([0569873](https://github.com/NativeScript/nativescript-cli/commit/0569873139576c3264c631699d9357a96d2d4dbf))
+* experimental SPM support ([#5721](https://github.com/NativeScript/nativescript-cli/issues/5721)) ([1443240](https://github.com/NativeScript/nativescript-cli/commit/14432403857354a8281b8fd1c1d3b4c2f6659403))
+* experimental yarn2+ support ([#5701](https://github.com/NativeScript/nativescript-cli/issues/5701)) ([363db96](https://github.com/NativeScript/nativescript-cli/commit/363db96d7a07245cf1635a2dc22b7a2110941f29))
+
+
+
+# [8.4.0](https://github.com/NativeScript/nativescript-cli/compare/v8.3.3...v8.4.0) (2022-11-30)
+
+
+### Bug Fixes
+
+* get `targetSdkVersion` from project ext ([#5656](https://github.com/NativeScript/nativescript-cli/issues/5656)) ([7574be2](https://github.com/NativeScript/nativescript-cli/commit/7574be2f4cd19b3f9ed28bf351f59ed22f11d7ae))
+* handle unknown/undefined platform edge case ([#5694](https://github.com/NativeScript/nativescript-cli/issues/5694)) ([aa3de73](https://github.com/NativeScript/nativescript-cli/commit/aa3de73193356eedc8ba1c68c9ae9e62b3902832))
+* hmr doesn't work properly in paths with the character '.' ([#5703](https://github.com/NativeScript/nativescript-cli/issues/5703)) ([7a312a2](https://github.com/NativeScript/nativescript-cli/commit/7a312a2113796a75d4fa22541249526bd4ef2dd6))
+* only include EXCLUDED_ARCHS workaround in xcode 12 ([#5705](https://github.com/NativeScript/nativescript-cli/issues/5705)) ([3e430cf](https://github.com/NativeScript/nativescript-cli/commit/3e430cffb52e5f210d3e32e293b9f464f2fc75b6))
+* **testing:** pin karma-jasmine to 4.0.2 ([#5695](https://github.com/NativeScript/nativescript-cli/issues/5695)) ([a5bbac7](https://github.com/NativeScript/nativescript-cli/commit/a5bbac7d32c0a60ea3426b3fbd9b795402d757d1)), closes [#5690](https://github.com/NativeScript/nativescript-cli/issues/5690)
+
+
+### Features
+
+* **doctor:** more informative android compile SDK messages ([#5697](https://github.com/NativeScript/nativescript-cli/issues/5697)) ([cfaa882](https://github.com/NativeScript/nativescript-cli/commit/cfaa882dd42d0d2447efb597442359ed19d9665d))
+* include-settings.gradle plugin ([#5693](https://github.com/NativeScript/nativescript-cli/issues/5693)) ([6155ff7](https://github.com/NativeScript/nativescript-cli/commit/6155ff7f40c37c1183f9cf66b3ea0a464fb6497c))
+* pass in tempPlugin flag during plugin build ([#5691](https://github.com/NativeScript/nativescript-cli/issues/5691)) ([645e9ea](https://github.com/NativeScript/nativescript-cli/commit/645e9ea516063db5da230fbd08db7d9fe37ab971))
+* **migrations:** use Angular 14.2 ([3dc0323](https://github.com/NativeScript/nativescript-cli/commit/3dc03231c7edc7efce9f97445a211f7657c8da1e))
+
+
+
 ## [8.3.3](https://github.com/NativeScript/nativescript-cli/compare/v8.3.2...v8.3.3) (2022-08-22)
 
 

config/config.json

@@ -4,10 +4,5 @@
 	"ANDROID_DEBUG_UI_MAC": "Google Chrome",
 	"USE_POD_SANDBOX": false,
 	"DISABLE_HOOKS": false,
-	"UPLOAD_PLAYGROUND_FILES_ENDPOINT": "https://play.nativescript.org/api/files",
-	"SHORTEN_URL_ENDPOINT": "https://play.nativescript.org/api/shortenurl?longUrl=%s",
-	"INSIGHTS_URL_ENDPOINT": "https://play-server.nativescript.org/api/insights?ipAddress=%s",
-	"WHOAMI_URL_ENDPOINT": "https://play.nativescript.org/api/whoami",
-	"PREVIEW_APP_ENVIRONMENT": "live",
 	"GA_TRACKING_ID": "UA-111455-51"
 }

config/test-dependencies.json

@@ -25,7 +25,8 @@
     },
     {
         "name": "karma-jasmine",
-        "framework": "jasmine"
+        "framework": "jasmine",
+        "version": "4.0.2"
     },
     {
         "name": "karma-qunit",

docs/man_pages/project/configuration/resources/resources-generate-icons.md

@@ -15,6 +15,10 @@ Usage | Synopsis
 ------|-------
 `$ tns resources generate icons <Path to image>` | Generate all icons for Android and iOS based on the specified image.
 
+### Options
+
+* `--background` Sets the background color of the icon. When no color is specified, a default value of `transparent` is used. `<Color>` is a valid color and can be represented with string, like `white`, `black`, `blue`, or with HEX representation, for example `#FFFFFF`, `#000000`, `#0000FF`. NOTE: As the `#` is special symbol in some terminals, make sure to place the value in quotes, for example `$ tns resources generate icons ../myImage.png --background "#FF00FF"`.
+
 ### Arguments
 
 * `<Path to image>` is a valid path to an image that will be used to generate all icons.

lib/base-package-manager.ts

@@ -130,7 +130,11 @@ export abstract class BasePackageManager implements INodePackageManager {
 	protected getFlagsString(config: any, asArray: boolean): any {
 		const array: Array<string> = [];
 		for (const flag in config) {
-			if (flag === "global" && this.packageManager !== "yarn" && this.packageManager !== "yarn2") {
+			if (
+				flag === "global" &&
+				this.packageManager !== "yarn" &&
+				this.packageManager !== "yarn2"
+			) {
 				array.push(`--${flag}`);
 				array.push(`${config[flag]}`);
 			} else if (config[flag]) {
@@ -145,7 +149,6 @@ export abstract class BasePackageManager implements INodePackageManager {
 						array.push(`--fields ${flag}`);
 					} else {
 						array.push(` ${flag}`);
-
 					}
 					continue;
 				}

lib/bootstrap.ts

@@ -58,6 +58,7 @@ injector.require("iOSProjectService", "./services/ios-project-service");
 injector.require("iOSProvisionService", "./services/ios-provision-service");
 injector.require("xcconfigService", "./services/xcconfig-service");
 injector.require("iOSSigningService", "./services/ios/ios-signing-service");
+injector.require("spmService", "./services/ios/spm-service");
 injector.require(
 	"xcodebuildArgsService",
 	"./services/ios/xcodebuild-args-service"
@@ -100,7 +101,7 @@ injector.require(
 	"./services/platform/platform-validation-service"
 );
 
-injector.require("buildArtefactsService", "./services/build-artefacts-service");
+injector.require("buildArtifactsService", "./services/build-artifacts-service");
 
 injector.require(
 	"deviceInstallAppService",
@@ -119,10 +120,6 @@ injector.requirePublicClass(
 	"debugController",
 	"./controllers/debug-controller"
 );
-injector.requirePublicClass(
-	"previewAppController",
-	"./controllers/preview-app-controller"
-);
 injector.requirePublicClass(
 	"updateController",
 	"./controllers/update-controller"
@@ -168,11 +165,6 @@ injector.require(
 	"googleAnalyticsProvider",
 	"./services/analytics/google-analytics-provider"
 );
-injector.requirePublicClass(
-	"companyInsightsController",
-	"./controllers/company-insights-controller"
-);
-
 injector.require("platformCommandParameter", "./platform-command-param");
 injector.requireCommand("create", "./commands/create-project");
 injector.requireCommand("clean", "./commands/clean");
@@ -308,34 +300,6 @@ injector.require(
 	"./services/livesync/ios-livesync-service"
 );
 injector.require("usbLiveSyncService", "./services/livesync/livesync-service"); // The name is used in https://github.com/NativeScript/nativescript-dev-typescript
-injector.require(
-	"previewAppFilesService",
-	"./services/livesync/playground/preview-app-files-service"
-);
-injector.require(
-	"previewAppLogProvider",
-	"./services/livesync/playground/preview-app-log-provider"
-);
-injector.require(
-	"previewAppPluginsService",
-	"./services/livesync/playground/preview-app-plugins-service"
-);
-injector.require(
-	"previewSdkService",
-	"./services/livesync/playground/preview-sdk-service"
-);
-injector.require(
-	"previewSchemaService",
-	"./services/livesync/playground/preview-schema-service"
-);
-injector.requirePublicClass(
-	"previewDevicesService",
-	"./services/livesync/playground/devices/preview-devices-service"
-);
-injector.requirePublic(
-	"previewQrCodeService",
-	"./services/livesync/playground/preview-qr-code-service"
-);
 injector.requirePublic("sysInfo", "./sys-info");
 
 injector.require(
@@ -352,7 +316,6 @@ injector.require(
 	"./device-sockets/ios/socket-request-executor"
 );
 injector.require("messages", "./common/messages/messages");
-injector.require("xmlValidator", "./xml-validator");
 
 injector.requireCommand("post-install-cli", "./commands/post-install");
 injector.requireCommand("migrate", "./commands/migrate");
@@ -395,7 +358,6 @@ injector.require(
 	"./services/terminal-spinner-service"
 );
 
-injector.require("playgroundService", "./services/playground-service");
 injector.require(
 	"platformEnvironmentRequirements",
 	"./services/platform-environment-requirements"

lib/color.ts

@@ -0,0 +1,7 @@
+// using chalk as some of our other dependencies are already using it...
+// exporting from here so we can easily refactor to a different color library if needed
+import * as chalk from "chalk";
+
+export type Color = typeof chalk.Color;
+
+export const color = chalk;

lib/commands/appstore-upload.ts

@@ -40,15 +40,16 @@ export class PublishIOS implements ICommand {
 	}
 
 	public async execute(args: string[]): Promise<void> {
-		await this.$itmsTransporterService.validate();
+		await this.$itmsTransporterService.validate(
+			this.$options.appleApplicationSpecificPassword
+		);
 
 		const username =
 			args[0] ||
 			(await this.$prompter.getString("Apple ID", { allowEmpty: false }));
+
 		const password =
 			args[1] || (await this.$prompter.getPassword("Apple ID password"));
-		const mobileProvisionIdentifier = args[2];
-		const codeSignIdentity = args[3];
 
 		const user = await this.$applePortalSessionService.createUserSession(
 			{ username, password },
@@ -66,6 +67,8 @@ export class PublishIOS implements ICommand {
 			);
 		}
 
+		const mobileProvisionIdentifier = this.$options.provision ?? args[2];
+
 		let ipaFilePath = this.$options.ipa
 			? path.resolve(this.$options.ipa)
 			: null;
@@ -76,25 +79,21 @@ export class PublishIOS implements ICommand {
 			);
 		}
 
-		if (!codeSignIdentity && !ipaFilePath) {
-			this.$logger.warn(
-				"No code sign identity set. A default code sign identity will be used. You can set one in app/App_Resources/iOS/build.xcconfig"
-			);
-		}
-
 		this.$options.release = true;
 
 		if (!ipaFilePath) {
 			const platform = this.$devicePlatformsConstants.iOS.toLowerCase();
 			// No .ipa path provided, build .ipa on out own.
-			if (mobileProvisionIdentifier || codeSignIdentity) {
+			if (mobileProvisionIdentifier) {
 				// This is not very correct as if we build multiple targets we will try to sign all of them using the signing identity here.
 				this.$logger.info(
-					"Building .ipa with the selected mobile provision and/or certificate."
+					"Building .ipa with the selected mobile provision and/or certificate. " +
+						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,
@@ -124,6 +123,7 @@ export class PublishIOS implements ICommand {
 			ipaFilePath,
 			shouldExtractIpa: !!this.$options.ipa,
 			verboseLogging: this.$logger.getLevel() === "TRACE",
+			teamId: this.$options.teamId,
 		});
 	}