Merge remote-tracking branch 'origin/main' into feat/vite-bundler-improvements

Author: NathanWalker

.github/workflows/npm_release_cli.yml

@@ -73,6 +73,8 @@ jobs:
 
       - name: Bump version for dev release
         if: ${{ !contains(github.ref, 'refs/tags/') && (github.event_name != 'workflow_dispatch' || inputs.release_type == 'dev') }}
+        env:
+          NPM_TAG: ${{ github.event_name == 'workflow_dispatch' && inputs.release_type == 'dev' && 'dev' || 'next' }}
         run: |
           NPM_VERSION=$(node ./scripts/get-next-version.js)
           echo NPM_VERSION=$NPM_VERSION >> $GITHUB_ENV

lib/commands/prepare.ts

@@ -22,7 +22,11 @@ export class PrepareCommand
 			hasSensitiveValue: false,
 		},
 		hmr: { type: OptionType.Boolean, default: false, hasSensitiveValue: false },
-
+		skipNative: {
+			type: OptionType.Boolean,
+			default: false,
+			hasSensitiveValue: false,
+		},
 		whatever: {
 			type: OptionType.Boolean,
 			default: false,
@@ -38,13 +42,13 @@ export class PrepareCommand
 		public $platformCommandParameter: ICommandParameter,
 		public $platformsDataService: IPlatformsDataService,
 		public $prepareDataService: PrepareDataService,
-		public $migrateController: IMigrateController
+		public $migrateController: IMigrateController,
 	) {
 		super(
 			$options,
 			$platformsDataService,
 			$platformValidationService,
-			$projectData
+			$projectData,
 		);
 		this.$projectData.initializeProjectData();
 	}
@@ -55,7 +59,7 @@ export class PrepareCommand
 		const prepareData = this.$prepareDataService.getPrepareData(
 			this.$projectData.projectDir,
 			platform,
-			this.$options
+			this.$options,
 		);
 		await this.$prepareController.prepare(prepareData);
 	}
@@ -68,7 +72,7 @@ export class PrepareCommand
 				this.$options.provision,
 				this.$options.teamId,
 				this.$projectData,
-				platform
+				platform,
 			));
 
 		if (!this.$options.force) {

lib/controllers/run-controller.ts

@@ -26,6 +26,15 @@ import { injector } from "../common/yok";
 
 export class RunController extends EventEmitter implements IRunController {
 	private prepareReadyEventHandler: any = null;
+	private _syncInProgress = false;
+	private _pendingSyncs: Map<
+		string,
+		{
+			data: IFilesChangeEventData;
+			projectData: IProjectData;
+			liveSyncInfo: ILiveSyncInfo;
+		}
+	> = new Map();
 
 	constructor(
 		protected $analyticsService: IAnalyticsService,
@@ -97,16 +106,11 @@ export class RunController extends EventEmitter implements IRunController {
 						projectData,
 						prepareData,
 					);
-					if (changesInfo.hasChanges) {
-						await this.syncChangedDataOnDevices(
-							data,
-							projectData,
-							liveSyncInfo,
-						);
+					if (!changesInfo.hasChanges) {
+						return;
 					}
-				} else {
-					await this.syncChangedDataOnDevices(data, projectData, liveSyncInfo);
 				}
+				this.scheduleSyncOnDevices(data, projectData, liveSyncInfo);
 			};
 
 			this.prepareReadyEventHandler = handler.bind(this);
@@ -840,11 +844,11 @@ export class RunController extends EventEmitter implements IRunController {
 					watchInfo.connectTimeout = null;
 					await watchAction();
 				}
-			} catch (err) {
+			} catch (err: any) {
 				this.$logger.warn(
 					`Unable to apply changes for device: ${
 						device.deviceInfo.identifier
-					}. Error is: ${err && err.message}.`,
+					}. Error is: ${err && err.message}. Will retry on next change.`,
 				);
 
 				this.emitCore(RunOnDeviceEvents.runOnDeviceError, {
@@ -856,12 +860,6 @@ export class RunController extends EventEmitter implements IRunController {
 						],
 					error: err,
 				});
-
-				await this.stop({
-					projectDir: projectData.projectDir,
-					deviceIdentifiers: [device.deviceInfo.identifier],
-					stopOptions: { shouldAwaitAllActions: false },
-				});
 			}
 		};
 
@@ -885,20 +883,85 @@ export class RunController extends EventEmitter implements IRunController {
 		);
 	}
 
+	private scheduleSyncOnDevices(
+		data: IFilesChangeEventData,
+		projectData: IProjectData,
+		liveSyncInfo: ILiveSyncInfo,
+	): void {
+		if (this._syncInProgress) {
+			const platform = data.platform;
+			const existing = this._pendingSyncs.get(platform);
+			if (existing) {
+				existing.data = this.mergeFilesChangeEvents(existing.data, data);
+			} else {
+				this._pendingSyncs.set(platform, { data, projectData, liveSyncInfo });
+			}
+			return;
+		}
+
+		this.executeSyncOnDevices(data, projectData, liveSyncInfo);
+	}
+
+	private async executeSyncOnDevices(
+		data: IFilesChangeEventData,
+		projectData: IProjectData,
+		liveSyncInfo: ILiveSyncInfo,
+	): Promise<void> {
+		this._syncInProgress = true;
+		try {
+			await this.syncChangedDataOnDevices(data, projectData, liveSyncInfo);
+		} catch (err: any) {
+			this.$logger.trace(`Error during sync on devices: ${err.message || err}`);
+		} finally {
+			const nextEntry = this._pendingSyncs.entries().next();
+			if (!nextEntry.done) {
+				const [platform, pending] = nextEntry.value;
+				this._pendingSyncs.delete(platform);
+				this.executeSyncOnDevices(
+					pending.data,
+					pending.projectData,
+					pending.liveSyncInfo,
+				);
+			} else {
+				this._syncInProgress = false;
+			}
+		}
+	}
+
+	private mergeFilesChangeEvents(
+		a: IFilesChangeEventData,
+		b: IFilesChangeEventData,
+	): IFilesChangeEventData {
+		return {
+			files: [...new Set([...a.files, ...b.files])],
+			staleFiles: [
+				...new Set([...(a.staleFiles || []), ...(b.staleFiles || [])]),
+			],
+			hasOnlyHotUpdateFiles: a.hasOnlyHotUpdateFiles && b.hasOnlyHotUpdateFiles,
+			hasNativeChanges: a.hasNativeChanges || b.hasNativeChanges,
+			hmrData: b.hmrData,
+			platform: b.platform,
+		};
+	}
+
 	private async addActionToChain<T>(
 		projectDir: string,
 		action: () => Promise<T>,
 	): Promise<T> {
 		const liveSyncInfo =
 			this.$liveSyncProcessDataService.getPersistedData(projectDir);
 		if (liveSyncInfo) {
-			liveSyncInfo.actionsChain = liveSyncInfo.actionsChain.then(async () => {
-				if (!liveSyncInfo.isStopped) {
-					liveSyncInfo.currentSyncAction = action();
-					const res = await liveSyncInfo.currentSyncAction;
-					return res;
-				}
-			});
+			liveSyncInfo.actionsChain = liveSyncInfo.actionsChain
+				.then(async () => {
+					if (!liveSyncInfo.isStopped) {
+						liveSyncInfo.currentSyncAction = action();
+						const res = await liveSyncInfo.currentSyncAction;
+						return res;
+					}
+				})
+				.catch((err: any) => {
+					this.$logger.warn(`Error in action chain: ${err.message || err}`);
+				});
 
 			const result = await liveSyncInfo.actionsChain;
 			return result;

lib/data/prepare-data.ts

@@ -14,7 +14,7 @@ export class PrepareData extends ControllerDataBase {
 	constructor(
 		public projectDir: string,
 		public platform: string,
-		data: IOptions
+		data: IOptions,
 	) {
 		super(projectDir, platform, data);
 
@@ -45,6 +45,11 @@ export class PrepareData extends ControllerDataBase {
 		}
 		this.hostProjectPath = data.hostProjectPath;
 
+		if (data.skipNative) {
+			this.nativePrepare = { skipNativePrepare: true };
+			this.watchNative = false;
+		}
+
 		this.uniqueBundle = !this.watch && data.uniqueBundle ? Date.now() : 0;
 	}
 }