pipe and output on error

Author: james-elicx

packages/cloudflare/src/cli/utils/run-wrangler.ts

@@ -56,7 +56,9 @@ function injectPassthroughFlagForArgs(options: BuildOptions, args: string[]) {
 }
 
 export function runWrangler(options: BuildOptions, args: string[], wranglerOpts: WranglerOptions = {}) {
-	const spawnArgs = [
+	const shouldPipeLogs = wranglerOpts.logging === "error";
+
+	const result = spawnSync(
 		options.packager,
 		[
 			options.packager === "bun" ? "x" : "exec",
@@ -72,26 +74,25 @@ export function runWrangler(options: BuildOptions, args: string[], wranglerOpts:
 				].filter((v): v is string => !!v)
 			),
 		],
-	] as const;
-
-	// ensure the logs are on a new line so they don't get appended to tqdm progress bars
-	if (options.debug) console.log();
-	logger.debug(`Running wrangler command: ${spawnArgs.flat().join(" ")}`);
-
-	const result = spawnSync(...spawnArgs, {
-		shell: true,
-		stdio: !options.debug && wranglerOpts.logging === "error" ? ["ignore", "ignore", "inherit"] : "inherit",
-		env: {
-			...process.env,
-			...(!options.debug && wranglerOpts.logging === "error" ? { WRANGLER_LOG: "error" } : undefined),
-			// `.env` files are handled by the adapter.
-			// Wrangler would load `.env.<wrangler env>` while we should load `.env.<process.env.NEXTJS_ENV>`
-			// See https://opennext.js.org/cloudflare/howtos/env-vars
-			CLOUDFLARE_LOAD_DEV_VARS_FROM_DOT_ENV: "false",
-		},
-	});
+		{
+			shell: true,
+			stdio: shouldPipeLogs ? ["ignore", "pipe", "pipe"] : "inherit",
+			env: {
+				...process.env,
+				// `.env` files are handled by the adapter.
+				// Wrangler would load `.env.<wrangler env>` while we should load `.env.<process.env.NEXTJS_ENV>`
+				// See https://opennext.js.org/cloudflare/howtos/env-vars
+				CLOUDFLARE_LOAD_DEV_VARS_FROM_DOT_ENV: "false",
+			},
+		}
+	);
 
 	if (result.status !== 0) {
+		if (shouldPipeLogs) {
+			process.stdout.write(result.stdout.toString());
+			process.stderr.write(result.stderr.toString());
+		}
+
 		logger.error("Wrangler command failed");
 		process.exit(1);
 	}