fix usage of shell-quote.parse on windows (#4105)

cloudflare · Oct 4, 2023 · 5fc7a88 · 5fc7a88
1 parent 92c391c
commit 5fc7a88
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 0 deletions.
diff --git a/packages/create-cloudflare/src/helpers/shell-quote.ts b/packages/create-cloudflare/src/helpers/shell-quote.ts
@@ -3,6 +3,15 @@ import shellquote from "shell-quote";
 export const quote = shellquote.quote;
 
 export function parse(cmd: string, env?: Record<string, string>): string[] {
+	// This is a workaround for a bug in shell-quote on Windows
+	// It was fixed and, because it was a breaking change, then reverted
+	// in https://github.com/ljharb/shell-quote/commit/144e1c2#diff-e727e4b
+	// We can remove this once we upgrade to a version that includes the fix
+	// tracked by https://github.com/ljharb/shell-quote/issues/10
+	if (process.platform === "win32") {
+		cmd = cmd.replaceAll("\\", "\\\\");
+	}
+
 	const entries = shellquote.parse(cmd, env);
 	const argv: string[] = [];
 

diff --git a/packages/wrangler/src/utils/shell-quote.ts b/packages/wrangler/src/utils/shell-quote.ts
@@ -3,6 +3,15 @@ import shellquote from "shell-quote";
 export const quote = shellquote.quote;
 
 export function parse(cmd: string, env?: Record<string, string>): string[] {
+	// This is a workaround for a bug in shell-quote on Windows
+	// It was fixed and, because it was a breaking change, then reverted
+	// in https://github.com/ljharb/shell-quote/commit/144e1c2#diff-e727e4b
+	// We can remove this once we upgrade to a version that includes the fix
+	// tracked by https://github.com/ljharb/shell-quote/issues/10
+	if (process.platform === "win32") {
+		cmd = cmd.replaceAll("\\", "\\\\");
+	}
+
 	const entries = shellquote.parse(cmd, env);
 	const argv: string[] = [];