Fix arguments passed to wrangler deploy not being forwarded to opennextjs-cloudflare deploy (#11710)

Author: dario-piotrowicz

.changeset/loud-seas-shave.md

@@ -0,0 +1,7 @@
+---
+"wrangler": patch
+---
+
+Fix arguments passed to `wrangler deploy` not being forwarded to `opennextjs-cloudflare deploy`
+
+`wrangler deploy` run in an open-next project delegates to `opennextjs-cloudflare deploy`, as part of this all the arguments passed to `wrangler deploy` need be forwarded to `opennextjs-cloudflare deploy`, before the arguments would be lost, now they will be successfully forwarded (for example `wrangler deploy --keep-vars` will call `opennextjs-cloudflare deploy --keep-vars`)

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

@@ -16004,6 +16004,11 @@ export default{
 		}
 
 		it("should delegate to open-next when run in an open-next project and set OPEN_NEXT_DEPLOY", async () => {
+			vi.spyOn(process, "argv", "get").mockReturnValue([
+				"npx",
+				"wrangler",
+				"deploy",
+			]);
 			const runCommandSpy = (await import("../autoconfig/c3-vendor/command"))
 				.runCommand;
 
@@ -16037,6 +16042,53 @@ export default{
 			`);
 		});
 
+		it("should delegate to open-next when run in an open-next project and set OPEN_NEXT_DEPLOY and pass the various CLI arguments", async () => {
+			vi.spyOn(process, "argv", "get").mockReturnValue([
+				"npx",
+				"wrangler",
+				"deploy",
+				"--keep-vars",
+			]);
+			const runCommandSpy = (await import("../autoconfig/c3-vendor/command"))
+				.runCommand;
+
+			await mockOpenNextLikeProject();
+
+			await runWrangler("deploy");
+
+			expect(runCommandSpy).toHaveBeenCalledOnce();
+			const call = (runCommandSpy as unknown as MockInstance).mock.calls[0];
+			const [command, options] = call;
+			expect(command).toEqual([
+				"npx",
+				"opennextjs-cloudflare",
+				"deploy",
+				// `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",
+			]);
+			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
+					//       ensure that we can't end up in an infinite wrangler<>open-next invokation loop
+					OPEN_NEXT_DEPLOY: "true",
+				},
+			});
+
+			expect(std).toMatchInlineSnapshot(`
+				Object {
+				  "debug": "",
+				  "err": "",
+				  "info": "",
+				  "out": "
+				 ⛅️ wrangler x.x.x
+				──────────────────
+				OpenNext project detected, calling \`opennextjs-cloudflare deploy\`",
+				  "warn": "",
+				}
+			`);
+		});
+
 		it("should not delegate to open-next deploy when run in an open-next project and OPEN_NEXT_DEPLOY is set", async () => {
 			vi.stubEnv("OPEN_NEXT_DEPLOY", "1");
 

packages/wrangler/src/deploy/open-next.ts

@@ -1,3 +1,4 @@
+import assert from "node:assert";
 import { readdir } from "node:fs/promises";
 import { getOpenNextDeployFromEnv } from "@cloudflare/workers-utils";
 import { runCommand } from "../autoconfig/c3-vendor/command";
@@ -22,14 +23,21 @@ export async function maybeDelegateToOpenNextDeployCommand(
 				"OpenNext project detected, calling `opennextjs-cloudflare deploy`"
 			);
 
+			const deployArgIdx = process.argv.findIndex((arg) => arg === "deploy");
+			assert(deployArgIdx !== -1, "Could not find `deploy` argument");
+			const deployArguments = process.argv.slice(deployArgIdx + 1);
+
 			const { npx } = await getPackageManager();
 
-			await runCommand([npx, "opennextjs-cloudflare", "deploy"], {
-				env: {
-					// We set `OPEN_NEXT_DEPLOY` here so that it's passed through to the `wrangler deploy` command that OpenNext delegates to in order to prevent an infinite loop
-					OPEN_NEXT_DEPLOY: "true",
-				},
-			});
+			await runCommand(
+				[npx, "opennextjs-cloudflare", "deploy", ...deployArguments],
+				{
+					env: {
+						// We set `OPEN_NEXT_DEPLOY` here so that it's passed through to the `wrangler deploy` command that OpenNext delegates to in order to prevent an infinite loop
+						OPEN_NEXT_DEPLOY: "true",
+					},
+				}
+			);
 
 			return true;
 		}