Merge remote-tracking branch 'origin/new_big_merge_test' into new_big_merge_test

Author: farfromrefug

lib/controllers/platform-controller.ts

@@ -69,7 +69,6 @@ export class PlatformController implements IPlatformController {
 			addPlatformData
 		);
 		const buildPath = projectData.platformsDir;
-		console.log('buildPath', buildPath, projectData.getBuildRelativeDirectoryPath())
 		this.$fs.ensureDirectoryExists(
 			path.join(projectData.platformsDir, platform)
 		);

lib/controllers/prepare-controller.ts

@@ -289,7 +289,7 @@ export class PrepareController extends EventEmitter {
 					data.platform.toLowerCase() === platformData.platformNameLowerCase
 				) {
 					if (this.isFileWatcherPaused()) return;
-					this.emitPrepareEvent({ ...data, files: data.files || [], hasNativeChanges: false });
+					this.emitPrepareEvent({ ...data, files: data.files ?? [], hasNativeChanges: false });
 				}
 			};
 

lib/services/device/device-install-app-service.ts

@@ -69,9 +69,9 @@ export class DeviceInstallAppService {
 			})
 		} else {
 			//we did not find corresponding abi let's try universal
-			const index = packages.findIndex(p => p.packageName.indexOf('universal') !== -1);
-			if (index !== -1) {
-				packageFile = packages[index].packageName;
+			const universalPackage = packages.find(p => p.packageName.includes('universal'));
+			if (universalPackage) {
+				packageFile = universalPackage.packageName;
 			}
 		}