Restrict the wrangler deploy delegation to opennextjs-cloudflare deploy only when the --x-autoconfig flag is used (#11796)

* Restrict the `wrangler deploy` delegation to `opennextjs-cloudflare deploy` only when the `--x-autoconfig` flag is used

* Update .changeset/common-readers-draw.md

Co-authored-by: Pete Bacon Darwin <pete@bacondarwin.com>

* Update .changeset/common-readers-draw.md

Co-authored-by: Victor Berchet <victor@suumit.com>

* remove the `canDelegateToOpenNext` variable

* add PRs to code comment

---------

Co-authored-by: Pete Bacon Darwin <pete@bacondarwin.com>
Co-authored-by: Victor Berchet <victor@suumit.com>

Author: 3 people

.changeset/common-readers-draw.md

@@ -0,0 +1,7 @@
+---
+"wrangler": patch
+---
+
+`wrangler deploy` delegates to `opennextjs-cloudflare deploy` only when the `--x-autoconfig` flag is used
+
+The `wrangler deploy` command has been updated to delegate to the `opennextjs-cloudflare deploy` command when run in an open-next project. Once this behavior had been introduced it caused a few issues. So it's been decided to enable it for the time being only when the `--x-autoconfig` flag is set (since this behavior, although generally valid, is only strictly necessary for the `wrangler deploy`'s autoconfig flow).

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

@@ -16008,18 +16008,24 @@ export default{
 				"npx",
 				"wrangler",
 				"deploy",
+				"--x-autoconfig",
 			]);
 			const runCommandSpy = (await import("../autoconfig/c3-vendor/command"))
 				.runCommand;
 
 			await mockOpenNextLikeProject();
 
-			await runWrangler("deploy");
+			await runWrangler("deploy --x-autoconfig");
 
 			expect(runCommandSpy).toHaveBeenCalledOnce();
 			const call = (runCommandSpy as unknown as MockInstance).mock.calls[0];
 			const [command, options] = call;
-			expect(command).toEqual(["npx", "opennextjs-cloudflare", "deploy"]);
+			expect(command).toEqual([
+				"npx",
+				"opennextjs-cloudflare",
+				"deploy",
+				"--x-autoconfig",
+			]);
 			expect(options).toMatchObject({
 				env: {
 					// Note: we want to ensure that OPEN_NEXT_DEPLOY has been set, this is not strictly necessary but it helps us
@@ -16048,13 +16054,14 @@ export default{
 				"wrangler",
 				"deploy",
 				"--keep-vars",
+				"--x-autoconfig",
 			]);
 			const runCommandSpy = (await import("../autoconfig/c3-vendor/command"))
 				.runCommand;
 
 			await mockOpenNextLikeProject();
 
-			await runWrangler("deploy");
+			await runWrangler("deploy --x-autoconfig");
 
 			expect(runCommandSpy).toHaveBeenCalledOnce();
 			const call = (runCommandSpy as unknown as MockInstance).mock.calls[0];
@@ -16066,6 +16073,7 @@ export default{
 				// `opennextjs-cloudflare deploy` accepts all the same arguments `wrangler deploy` does (since it then forwards them
 				// to wrangler), so we do want to make sure that arguments are indeed forwarded to `opennextjs-cloudflare deploy`
 				"--keep-vars",
+				"--x-autoconfig",
 			]);
 			expect(options).toMatchObject({
 				env: {
@@ -16097,6 +16105,35 @@ export default{
 
 			await mockOpenNextLikeProject();
 
+			await runWrangler("deploy --x-autoconfig");
+
+			expect(runCommandSpy).not.toHaveBeenCalledOnce();
+
+			expect(std.out).toMatchInlineSnapshot(`
+				"
+				 ⛅️ wrangler x.x.x
+				──────────────────
+				Total Upload: xx KiB / gzip: xx KiB
+				Worker Startup Time: 100 ms
+				Your Worker has access to the following bindings:
+				Binding            Resource
+				env.ASSETS         Assets
+
+				Uploaded test-name (TIMINGS)
+				Deployed test-name triggers (TIMINGS)
+				  https://test-name.test-sub-domain.workers.dev
+				Current Version ID: Galaxy-Class"
+			`);
+			expect(std.err).toMatchInlineSnapshot(`""`);
+			expect(std.warn).toMatchInlineSnapshot(`""`);
+		});
+
+		it("should not delegate to open-next deploy when the --x-autoconfig flag is not provided", async () => {
+			const runCommandSpy = (await import("../autoconfig/c3-vendor/command"))
+				.runCommand;
+
+			await mockOpenNextLikeProject();
+
 			await runWrangler("deploy");
 
 			expect(runCommandSpy).not.toHaveBeenCalledOnce();
@@ -16129,7 +16166,7 @@ export default{
 			// Let's delete the next.config.js file
 			fs.rmSync("./next.config.js");
 
-			await runWrangler("deploy");
+			await runWrangler("deploy --x-autoconfig");
 
 			expect(runCommandSpy).not.toHaveBeenCalledOnce();
 
@@ -16161,7 +16198,7 @@ export default{
 			// Let's delete the open-next.config.ts file
 			fs.rmSync("./open-next.config.ts");
 
-			await runWrangler("deploy");
+			await runWrangler("deploy --x-autoconfig");
 
 			expect(runCommandSpy).not.toHaveBeenCalledOnce();
 

packages/wrangler/src/deploy/index.ts

@@ -302,6 +302,12 @@ export const deployCommand = createCommand({
 		//       make sure that the deployment of brand newly auto-configured Next.js apps is correctly
 		//       delegated here
 		const deploymentDelegatedToOpenNext =
+			// Currently the delegation to open-next is gated behind the autoconfig experimental flag, this is because
+			// this behavior is currently only necessary in the autoconfig flow and having it un-gated/stable in wrangler
+			// releases caused different issues. All the issues should have been fixed (by
+			// https://github.com/cloudflare/workers-sdk/pull/11694 and https://github.com/cloudflare/workers-sdk/pull/11710)
+			// but as a precaution we're gating the feature under the autoconfig flag for the time being
+			args.experimentalAutoconfig &&
 			!args.dryRun &&
 			(await maybeDelegateToOpenNextDeployCommand(process.cwd()));