Resolve merge conflicts with main
- extraction/index.ts: use picomatch with static import (replacing dynamic require) and keep normalizePath for other call sites - utils.ts: keep normalizePath from main, take PR's PID-based FileLock
This commit is contained in:
@@ -166,6 +166,14 @@ export function clamp(value: number, min: number, max: number): number {
|
||||
return Math.max(min, Math.min(max, value));
|
||||
}
|
||||
|
||||
/**
|
||||
* Normalize a file path to use forward slashes.
|
||||
* Fixes Windows backslash paths so glob matching works consistently.
|
||||
*/
|
||||
export function normalizePath(filePath: string): string {
|
||||
return filePath.replace(/\\/g, '/');
|
||||
}
|
||||
|
||||
/**
|
||||
* Cross-process file lock using a lock file with PID tracking.
|
||||
*
|
||||
|
||||
Reference in New Issue
Block a user