Merge remote-tracking branch 'origin/main' into pre/v9-combined-testing

Author: NathanWalker

lib/services/bundler/bundler-compiler-service.ts

@@ -50,6 +50,9 @@ interface IBundlerCompilation {
 	staleAssets: string[];
 }
 
+/* for specific bundling debugging separate from logger */
+const debugLog = false;
+
 export class BundlerCompilerService
 	extends EventEmitter
 	implements IBundlerCompilerService
@@ -118,7 +121,9 @@ export class BundlerCompilerService
 						(message as IBundlerEmitMessage).emittedFiles
 					) {
 						message = message as IBundlerEmitMessage;
-						console.log("Received Vite IPC message:", message);
+						if (debugLog) {
+							console.log("Received Vite IPC message:", message);
+						}
 
 						// Copy Vite output files directly to platform destination
 						const distOutput = path.join(projectData.projectDir, "dist");
@@ -127,15 +132,19 @@ export class BundlerCompilerService
 							this.$options.hostProjectModuleName,
 						);
 
-						console.log(`🔥 Copying from ${distOutput} to ${destDir}`);
+						if (debugLog) {
+							console.log(`🔥 Copying from ${distOutput} to ${destDir}`);
+						}
 
 						// Determine which files to copy based on build type and changes
 						if (message.isHMR) {
 							// HMR updates: only copy changed files
-							console.log(
-								"🔥 HMR update - copying only changed files for:",
-								message.changedFiles,
-							);
+							if (debugLog) {
+								console.log(
+									"🔥 HMR update - copying only changed files for:",
+									message.changedFiles,
+								);
+							}
 
 							// For HTML template changes, we need to copy the component files that were rebuilt
 							let filesToCopy = message.emittedFiles;
@@ -152,8 +161,35 @@ export class BundlerCompilerService
 										f === "bundle.mjs" ||
 										f === "bundle.mjs.map",
 								);
+								if (debugLog) {
+									console.log(
+										"🔥 HTML change detected - copying component files:",
+										filesToCopy,
+									);
+								}
+							}
+
+							this.copyViteBundleToNative(distOutput, destDir, filesToCopy);
+						} else if (
+							message.buildType === "incremental" &&
+							message.changedFiles &&
+							message.changedFiles.length > 0
+						) {
+							// Incremental builds: only copy files that are likely affected by the changes
+							if (debugLog) {
 								console.log(
-									"🔥 HTML change detected - copying component files:",
+									"🔥 Incremental build - copying only relevant files for:",
+									message.changedFiles,
+								);
+							}
+
+							const filesToCopy = this.getIncrementalFilesToCopy(
+								message.emittedFiles,
+								message.changedFiles,
+							);
+							if (debugLog) {
+								console.log(
+									"🔥 Incremental build - files to copy:",
 									filesToCopy,
 								);
 							}
@@ -178,16 +214,20 @@ export class BundlerCompilerService
 
 							this.copyViteBundleToNative(distOutput, destDir, filesToCopy);
 						} else {
-							console.log("🔥 Full build - copying all files");
+							if (debugLog) {
+								console.log("🔥 Full build - copying all files");
+							}
 							this.copyViteBundleToNative(distOutput, destDir);
 						}
 
 						// Resolve the promise on first build completion
 						if (isFirstBundlerWatchCompilation) {
 							isFirstBundlerWatchCompilation = false;
-							console.log(
-								"Vite first build completed, resolving compileWithWatch",
-							);
+							if (debugLog) {
+								console.log(
+									"Vite first build completed, resolving compileWithWatch",
+								);
+							}
 							resolve(childProcess);
 						}
 
@@ -224,15 +264,19 @@ export class BundlerCompilerService
 						});
 
 						if (message.isHMR) {
-							console.log(
-								"🔥 Skipping BUNDLER_COMPILATION_COMPLETE for HMR update - app will not restart",
-							);
+							if (debugLog) {
+								console.log(
+									"🔥 Skipping BUNDLER_COMPILATION_COMPLETE for HMR update - app will not restart",
+								);
+							}
 						} else {
 							// Only emit BUNDLER_COMPILATION_COMPLETE for non-HMR builds
 							// This prevents the CLI from restarting the app during HMR updates
-							console.log(
-								"🔥 Emitting BUNDLER_COMPILATION_COMPLETE for full build",
-							);
+							if (debugLog) {
+								console.log(
+									"🔥 Emitting BUNDLER_COMPILATION_COMPLETE for full build",
+								);
+							}
 							this.emit(BUNDLER_COMPILATION_COMPLETE, data);
 						}
 						return;
@@ -537,7 +581,9 @@ export class BundlerCompilerService
 			});
 		}
 
-		console.log("args:", args);
+		if (debugLog) {
+			console.log("args:", args);
+		}
 
 		const childProcess = this.$childProcess.spawn(
 			process.execPath,
@@ -881,17 +927,21 @@ export class BundlerCompilerService
 		specificFiles: string[] = null,
 	) {
 		// Clean and copy Vite output to native platform folder
-		console.log(`Copying Vite bundle from "${distOutput}" to "${destDir}"`);
+		if (debugLog) {
+			console.log(`Copying Vite bundle from "${distOutput}" to "${destDir}"`);
+		}
 
 		const fs = require("fs");
 
 		try {
 			if (specificFiles) {
 				// Selective mode: only copy specific files (HMR or incremental)
-				console.log(
-					"🔥 Selective copy - copying specific files:",
-					specificFiles,
-				);
+				if (debugLog) {
+					console.log(
+						"🔥 Selective copy - copying specific files:",
+						specificFiles,
+					);
+				}
 
 				// Ensure destination directory exists
 				fs.mkdirSync(destDir, { recursive: true });
@@ -908,11 +958,15 @@ export class BundlerCompilerService
 
 					fs.copyFileSync(srcPath, destPath);
 
-					console.log(`🔥 Copied ${file}`);
+					if (debugLog) {
+						console.log(`🔥 Copied ${file}`);
+					}
 				}
 			} else {
 				// Full build mode: clean and copy everything
-				console.log("🔥 Full build: Copying all files");
+				if (debugLog) {
+					console.log("🔥 Full build: Copying all files");
+				}
 
 				// Clean destination directory
 				if (fs.existsSync(destDir)) {
@@ -995,18 +1049,26 @@ export class BundlerCompilerService
 			const ws = new WebSocket("ws://localhost:24678");
 
 			ws.on("open", () => {
-				console.log("🔥 Sending HMR notification to bridge:", message.type);
+				if (debugLog) {
+					console.log("🔥 Sending HMR notification to bridge:", message.type);
+				}
 				ws.send(JSON.stringify(message));
 				ws.close();
 			});
 
 			ws.on("error", () => {
 				// HMR bridge not available, which is fine
-				console.log("🔥 HMR bridge not available (this is normal without HMR)");
+				if (debugLog) {
+					console.log(
+						"🔥 HMR bridge not available (this is normal without HMR)",
+					);
+				}
 			});
 		} catch (error) {
 			// WebSocket not available, which is fine
-			console.log("🔥 WebSocket not available for HMR notifications");
+			if (debugLog) {
+				console.log("🔥 WebSocket not available for HMR notifications");
+			}
 		}
 	}