Skip to content

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

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
RamIdeas merged 4 commits into from
Oct 4, 2023
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
3ae1987
fix usage of shell-quote.parse on windows
RamIdeas Oct 4, 2023
5c4d843
shorten github url
RamIdeas Oct 4, 2023
cb6bcfc
try replaceAll
RamIdeas Oct 4, 2023
2887c7c
switch replacement args order
RamIdeas Oct 4, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions packages/create-cloudflare/src/helpers/shell-quote.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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[] = [];

Expand Down
9 changes: 9 additions & 0 deletions packages/wrangler/src/utils/shell-quote.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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[] = [];

Expand Down