From 8ea1e96b3231e2b4b565818d2845401fa279b08b Mon Sep 17 00:00:00 2001 From: Patrik Oldsberg Date: Tue, 17 Aug 2021 14:31:35 +0200 Subject: [PATCH] cli: fix diff command filepath handling on windows Signed-off-by: Patrik Oldsberg --- .changeset/friendly-eyes-explain.md | 5 +++++ packages/cli/src/lib/diff/handlers.ts | 3 ++- 2 files changed, 7 insertions(+), 1 deletion(-) create mode 100644 .changeset/friendly-eyes-explain.md diff --git a/.changeset/friendly-eyes-explain.md b/.changeset/friendly-eyes-explain.md new file mode 100644 index 0000000000..0bee61a82c --- /dev/null +++ b/.changeset/friendly-eyes-explain.md @@ -0,0 +1,5 @@ +--- +'@backstage/cli': patch +--- + +Fix file path handling in diff commands on Windows. diff --git a/packages/cli/src/lib/diff/handlers.ts b/packages/cli/src/lib/diff/handlers.ts index 5cbddde0ec..4a17125e5a 100644 --- a/packages/cli/src/lib/diff/handlers.ts +++ b/packages/cli/src/lib/diff/handlers.ts @@ -16,6 +16,7 @@ import chalk from 'chalk'; import { diffLines } from 'diff'; +import { sep, posix } from 'path'; import { FileDiff, PromptFunc, FileHandler, WriteFileFunc } from './types'; function sortObjectKeys(obj: Record) { @@ -281,7 +282,7 @@ export async function handleAllFiles( promptFunc: PromptFunc, ) { for (const file of files) { - const { path } = file; + const path = file.path.split(sep).join(posix.sep); const fileHandler = fileHandlers.find(handler => handler.patterns.some(pattern => typeof pattern === 'string' ? pattern === path : pattern.test(path),