Skip to content

Commit 56bc16d

Browse files
committed
fix: npm failing to pass args to wrangler
1 parent 81af13b commit 56bc16d

File tree

2 files changed

+28
-5
lines changed

2 files changed

+28
-5
lines changed

.changeset/strange-icons-camp.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
"@opennextjs/cloudflare": patch
3+
---
4+
5+
fix: npm failing to pass args to wrangler

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

Lines changed: 23 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,17 +12,35 @@ type WranglerOptions = {
1212
logging?: "all" | "error";
1313
};
1414

15+
function injectPassthroughFlagForArgs(options: BuildOptions, args: string[]) {
16+
if (options.packager !== "npm" && options.packager !== "yarn") {
17+
return args;
18+
}
19+
20+
const flagInArgsIndex = args.findIndex((v) => v.startsWith("--"));
21+
if (flagInArgsIndex !== -1) {
22+
return [...args.slice(0, flagInArgsIndex), "--", ...args.slice(flagInArgsIndex)];
23+
}
24+
25+
return args;
26+
}
27+
1528
export function runWrangler(options: BuildOptions, args: string[], wranglerOpts: WranglerOptions = {}) {
1629
const result = spawnSync(
1730
options.packager,
1831
[
1932
options.packager === "bun" ? "x" : "exec",
2033
"wrangler",
21-
...args,
22-
wranglerOpts.environment && `--env ${wranglerOpts.environment}`,
23-
wranglerOpts.target === "remote" && !wranglerOpts.excludeRemoteFlag && "--remote",
24-
wranglerOpts.target === "local" && "--local",
25-
].filter((v): v is string => !!v),
34+
...injectPassthroughFlagForArgs(
35+
options,
36+
[
37+
...args,
38+
wranglerOpts.environment && `--env ${wranglerOpts.environment}`,
39+
wranglerOpts.target === "remote" && !wranglerOpts.excludeRemoteFlag && "--remote",
40+
wranglerOpts.target === "local" && "--local",
41+
].filter((v): v is string => !!v)
42+
),
43+
],
2644
{
2745
shell: true,
2846
stdio: wranglerOpts.logging === "error" ? ["ignore", "ignore", "inherit"] : "inherit",

0 commit comments

Comments
 (0)