Merge pull request #6083 from tannerlinsley/taren/copy-vite-production-bundle

fix: copy Vite output for production builds

Resolved conflicts with this branch's existing non-watch Vite copy step
by combining both implementations:

- kept #6083's strict semantics: copyViteBundleToNative gains a
  failOnError flag, compileWithoutWatch passes true and rejects when a
  successful build's bundle cannot be copied, and the Vite output
  directory is validated before the destination is cleaned so a missing
  build can no longer wipe a previously good bundle
- kept this branch's NS_VITE_DIST_DIR-aware output path resolution:
  #6083's getViteBuildPaths() helper now delegates to
  getViteDistOutputPath() instead of hardcoding .ns-vite-build
- adapted #6083's compileWithoutWatch copy tests to this branch's test
  conventions (getBundler stub, per-test hostProjectModuleName,
  NS_VITE_DIST_DIR save/restore guard)

Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>

Author: NathanWalker

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

@@ -90,6 +90,19 @@ export class BundlerCompilerService
 		);
 	}
 
+	private getViteBuildPaths(
+		platformData: IPlatformData,
+		projectData: IProjectData,
+	) {
+		return {
+			distOutput: this.getViteDistOutputPath(projectData.projectDir),
+			destDir: path.join(
+				platformData.appDestinationDirectoryPath,
+				this.$options.hostProjectModuleName,
+			),
+		};
+	}
+
 	public async compileWithWatch(
 		platformData: IPlatformData,
 		projectData: IProjectData,
@@ -158,12 +171,9 @@ export class BundlerCompilerService
 						}
 
 						// Copy Vite output files directly to platform destination
-						const distOutput = this.getViteDistOutputPath(
-							projectData.projectDir,
-						);
-						const destDir = path.join(
-							platformData.appDestinationDirectoryPath,
-							this.$options.hostProjectModuleName,
+						const { distOutput, destDir } = this.getViteBuildPaths(
+							platformData,
+							projectData,
 						);
 
 						if (debugLog) {
@@ -428,25 +438,21 @@ export class BundlerCompilerService
 						// is left empty (or worse, runs stale dev/HMR artifacts from
 						// a previous `ns debug` run) and the runtime crashes on
 						// launch with `Check failed: has_pending_exception()`.
-						if (isVite) {
-							try {
-								const distOutput = this.getViteDistOutputPath(
-									projectData.projectDir,
-								);
-								const destDir = path.join(
-									platformData.appDestinationDirectoryPath,
-									this.$options.hostProjectModuleName,
-								);
-								this.copyViteBundleToNative(distOutput, destDir);
-							} catch (copyErr) {
-								this.$logger.warn(
-									`Failed to copy Vite output to platform destination: ${
-										(copyErr as Error).message
-									}`,
+						// The copy must succeed for the build to succeed — a build
+						// whose bundle never reached the native app is not a
+						// successful build, so copy failures reject here.
+						try {
+							if (isVite) {
+								const { distOutput, destDir } = this.getViteBuildPaths(
+									platformData,
+									projectData,
 								);
+								this.copyViteBundleToNative(distOutput, destDir, null, true);
 							}
+							resolve();
+						} catch (error) {
+							reject(error);
 						}
-						resolve();
 					} else {
 						const error: any = new Error(
 							`Executing ${projectData.bundler} failed with exit code ${exitCode}.`,
@@ -1102,6 +1108,7 @@ export class BundlerCompilerService
 		distOutput: string,
 		destDir: string,
 		specificFiles: string[] = null,
+		failOnError = false,
 	) {
 		// Clean and copy Vite output to native platform folder
 		if (debugLog) {
@@ -1143,23 +1150,31 @@ export class BundlerCompilerService
 					console.log("Full build: Copying all files.");
 				}
 
+				// Validate the source before touching the destination — cleaning
+				// destDir first would wipe a previously good bundle and leave an
+				// empty app folder behind a missing Vite output.
+				if (!this.$fs.exists(distOutput)) {
+					throw new Error(
+						`Vite output directory does not exist: ${distOutput}`,
+					);
+				}
+
 				// Clean destination directory
 				if (this.$fs.exists(destDir)) {
 					this.$fs.deleteDirectory(destDir);
 				}
 				this.$fs.createDirectory(destDir);
 
 				// Copy all files from dist to platform destination
-				if (this.$fs.exists(distOutput)) {
-					this.copyRecursiveSync(distOutput, destDir);
-				} else {
-					this.$logger.warn(
-						`Vite output directory does not exist: ${distOutput}`,
-					);
-				}
+				this.copyRecursiveSync(distOutput, destDir);
 			}
 		} catch (error) {
-			this.$logger.warn(`Failed to copy Vite bundle: ${error.message}`);
+			const copyError =
+				error instanceof Error ? error : new Error(String(error));
+			if (failOnError) {
+				throw copyError;
+			}
+			this.$logger.warn(`Failed to copy Vite bundle: ${copyError.message}`);
 		}
 	}
 

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

@@ -337,6 +337,79 @@ describe("BundlerCompilerService", () => {
 	});
 
 	describe("compileWithoutWatch", () => {
+		it("copies a successful Vite build to the native app", async () => {
+			const previous = process.env.NS_VITE_DIST_DIR;
+			delete process.env.NS_VITE_DIST_DIR;
+			try {
+				const childProcess = Object.assign(new EventEmitter(), { pid: 1234 });
+				const copies: Array<{
+					distOutput: string;
+					destDir: string;
+					failOnError: boolean;
+				}> = [];
+				testInjector.resolve("options").hostProjectModuleName = "app";
+				(<any>bundlerCompilerService).getBundler = () => "vite";
+				(<any>bundlerCompilerService).startBundleProcess = async () =>
+					childProcess;
+				(<any>bundlerCompilerService).copyViteBundleToNative = (
+					distOutput: string,
+					destDir: string,
+					_specificFiles: string[],
+					failOnError: boolean,
+				) => {
+					copies.push({ distOutput, destDir, failOnError });
+				};
+
+				const compilation = bundlerCompilerService.compileWithoutWatch(
+					<any>{
+						platformNameLowerCase: "android",
+						appDestinationDirectoryPath: "/project/platforms/android",
+					},
+					<any>{ projectDir: "/project" },
+					<any>{},
+				);
+				setImmediate(() => childProcess.emit("close", 0));
+				await compilation;
+
+				assert.deepEqual(copies, [
+					{
+						distOutput: path.join("/project", ".ns-vite-build"),
+						destDir: path.join("/project/platforms/android", "app"),
+						failOnError: true,
+					},
+				]);
+			} finally {
+				if (previous === undefined) {
+					delete process.env.NS_VITE_DIST_DIR;
+				} else {
+					process.env.NS_VITE_DIST_DIR = previous;
+				}
+			}
+		});
+
+		it("fails when a successful Vite build cannot be copied", async () => {
+			const childProcess = Object.assign(new EventEmitter(), { pid: 1234 });
+			testInjector.resolve("options").hostProjectModuleName = "app";
+			(<any>bundlerCompilerService).getBundler = () => "vite";
+			(<any>bundlerCompilerService).startBundleProcess = async () =>
+				childProcess;
+			(<any>bundlerCompilerService).copyViteBundleToNative = () => {
+				throw new Error("copy failed");
+			};
+
+			const compilation = bundlerCompilerService.compileWithoutWatch(
+				<any>{
+					platformNameLowerCase: "ios",
+					appDestinationDirectoryPath: "/project/platforms/ios",
+				},
+				<any>{ projectDir: "/project" },
+				<any>{},
+			);
+			setImmediate(() => childProcess.emit("close", 0));
+
+			await assert.isRejected(compilation, "copy failed");
+		});
+
 		it("fails when the value set for bundlerConfigPath is not existant file", async () => {
 			const bundlerConfigPath = "some path.js";
 			testInjector.resolve("fs").exists = (filePath: string) =>