Suppress some Wrangler output when running wrangler setup from C3

Author: penalosa

.changeset/plain-cameras-cheer.md

@@ -0,0 +1,6 @@
+---
+"create-cloudflare": minor
+"wrangler": minor
+---
+
+Suppress some Wrangler output when running wrangler setup from C3

packages/create-cloudflare/src/cli.ts

@@ -169,7 +169,14 @@ const configure = async (ctx: C3Context) => {
 	if (ctx.args.experimental) {
 		const { npx } = detectPackageManager();
 
-		await runCommand([npx, "wrangler", "setup", "--yes"]);
+		await runCommand([
+			npx,
+			"wrangler",
+			"setup",
+			"--yes",
+			"--no-completion-message",
+			"--no-install-wrangler",
+		]);
 	} else {
 		// Note: This _must_ be called before the configure phase since
 		//       pre-existing workers assume its presence in their configure phase

packages/wrangler/src/__tests__/setup.test.ts

@@ -61,10 +61,13 @@ describe("wrangler setup", () => {
 	test("should run autoconfig when project is not configured", async () => {
 		await seed({
 			"public/index.html": `<h1>Hello World</h1>`,
+			"package.json": JSON.stringify({}),
 		});
 
 		// Let's not actually install Wrangler, to speed up tests
-		vi.spyOn(c3, "installWrangler").mockImplementation(async () => {});
+		const installSpy = vi
+			.spyOn(c3, "installWrangler")
+			.mockImplementation(async () => {});
 
 		const runSpy = vi.spyOn(run, "runAutoConfig");
 
@@ -73,11 +76,51 @@ describe("wrangler setup", () => {
 		// autoconfig should have been run
 		expect(runSpy).toHaveBeenCalled();
 
+		expect(installSpy).toHaveBeenCalled();
+
 		expect(std.out).toContain(
 			"🎉 Your project is now setup to deploy to Cloudflare"
 		);
 	});
 
+	test("should not display completion message when disabled", async () => {
+		await seed({
+			"public/index.html": `<h1>Hello World</h1>`,
+		});
+
+		// Let's not actually install Wrangler, to speed up tests
+		vi.spyOn(c3, "installWrangler").mockImplementation(async () => {});
+
+		const runSpy = vi.spyOn(run, "runAutoConfig");
+
+		await runWrangler("setup --no-completion-message");
+
+		// autoconfig should have been run
+		expect(runSpy).toHaveBeenCalled();
+
+		expect(std.out).not.toContain("🎉 Your project");
+	});
+
+	test("should not install Wrangler when skipped", async () => {
+		await seed({
+			"public/index.html": `<h1>Hello World</h1>`,
+			"package.json": JSON.stringify({}),
+		});
+
+		const installSpy = vi
+			.spyOn(c3, "installWrangler")
+			.mockImplementation(async () => {});
+
+		const runSpy = vi.spyOn(run, "runAutoConfig");
+
+		await runWrangler("setup --no-install-wrangler");
+
+		// autoconfig should have been run
+		expect(runSpy).toHaveBeenCalled();
+
+		expect(installSpy).not.toHaveBeenCalled();
+	});
+
 	describe("--dry-run", () => {
 		test("should stop before running autoconfig when project is already configured", async () => {
 			await seed({

packages/wrangler/src/autoconfig/run.ts

@@ -107,7 +107,7 @@ export async function runAutoConfig(
 		`Running autoconfig with:\n${JSON.stringify(autoConfigDetails, null, 2)}...`
 	);
 
-	if (autoConfigSummary.wranglerInstall) {
+	if (autoConfigSummary.wranglerInstall && autoConfigOptions.installWrangler) {
 		await installWrangler();
 	}
 

packages/wrangler/src/autoconfig/types.ts

@@ -33,6 +33,10 @@ export type AutoConfigOptions = {
 	 * Note: When `dryRun` is `true` the the confirmation prompts are always skipped.
 	 */
 	skipConfirmations?: boolean;
+	/**
+	 * Whether to install Wrangler during autoconfig
+	 */
+	installWrangler?: boolean;
 };
 
 export type AutoConfigSummary = {

packages/wrangler/src/setup.ts

@@ -28,29 +28,53 @@ export const setupCommand = createCommand({
 				"Runs the command without applying any filesystem modifications",
 			type: "boolean",
 		},
+		"completion-message": {
+			describe:
+				"Display a message with deployment details after `wrangler setup` is complete",
+			type: "boolean",
+			default: true,
+			hidden: true,
+		},
+		"install-wrangler": {
+			describe: "Install Wrangler during project setup",
+			type: "boolean",
+			default: true,
+			hidden: true,
+		},
 	},
 
 	async handler(args, { config }) {
 		const details = await getDetailsForAutoConfig({
 			wranglerConfig: config,
 		});
 
+		function logCompletionMessage(message: string) {
+			if (args.completionMessage) {
+				logger.log(message);
+			}
+		}
+
 		// Only run auto config if the project is not already configured
 		if (!details.configured) {
 			await runAutoConfig(details, {
 				runBuild: args.build,
 				skipConfirmations: args.yes,
 				dryRun: args.dryRun,
+				installWrangler: args.installWrangler,
 			});
 			if (!args.dryRun) {
-				logger.log("🎉 Your project is now setup to deploy to Cloudflare");
+				logCompletionMessage(
+					"🎉 Your project is now setup to deploy to Cloudflare"
+				);
 			}
 		} else {
-			logger.log("🎉 Your project is already setup to deploy to Cloudflare");
+			logCompletionMessage(
+				"🎉 Your project is already setup to deploy to Cloudflare"
+			);
 		}
 		if (!args.dryRun) {
 			const { type } = await getPackageManager();
-			logger.log(
+			logCompletionMessage(
 				`You can now deploy with ${brandColor(details.packageJson ? `${type} run deploy` : "wrangler deploy")}`
 			);
 		}