picomatch patch → unmatch

Author: webpro

package.json

@@ -45,12 +45,11 @@
   },
   "dependencies": {
     "fdir": "^6.4.3",
-    "picomatch": "^4.0.2"
+    "unmatch": "^1.0.1"
   },
   "devDependencies": {
     "@biomejs/biome": "^1.9.4",
     "@types/node": "^22.13.4",
-    "@types/picomatch": "^3.0.2",
     "fs-fixture": "^2.7.0",
     "tsup": "^8.3.6",
     "typescript": "^5.7.3"
@@ -62,10 +61,5 @@
     "access": "public",
     "provenance": true
   },
-  "packageManager": "pnpm@10.4.1",
-  "pnpm": {
-    "patchedDependencies": {
-      "picomatch@4.0.2": "patches/picomatch@4.0.2.patch"
-    }
-  }
+  "packageManager": "pnpm@10.4.1"
 }

patches/picomatch@4.0.2.patch

@@ -1,6 +1,6 @@
 import path, { posix } from 'node:path';
 import { type Options as FdirOptions, fdir } from 'fdir';
-import picomatch from 'picomatch';
+import match from 'unmatch';
 import { escapePath, getPartialMatcher, isDynamicPattern, log, splitPattern } from './utils.ts';
 
 const PARENT_DIRECTORY = /^(\/?\.\.)+/;
@@ -184,16 +184,16 @@ function crawl(options: GlobOptions, cwd: string, sync: boolean) {
     log('internal processing patterns:', processed);
   }
 
-  const unignoreMatcher = processed.unignore.length === 0 ? undefined : picomatch(processed.unignore);
+  const unignoreMatcher = processed.unignore.length === 0 ? undefined : match(processed.unignore);
 
-  const matcher = picomatch(processed.match, {
+  const matcher = match(processed.match, {
     dot: options.dot,
     nocase,
     ignore: processed.ignore,
-    onIgnore: unignoreMatcher ? result => unignoreMatcher(result.output) : undefined
+    onIgnore: unignoreMatcher ? result => unignoreMatcher(result.output) && match.constants.UNIGNORE : undefined
   });
 
-  const ignore = picomatch(processed.ignore, {
+  const ignore = match(processed.ignore, {
     dot: options.dot,
     nocase
   });

pnpm-lock.yaml

@@ -1,4 +1,4 @@
-import picomatch, { type Matcher } from 'picomatch';
+import match, { type Matcher } from 'unmatch';
 
 // #region PARTIAL MATCHER
 export interface PartialMatcherOptions {
@@ -18,7 +18,7 @@ export function getPartialMatcher(patterns: string[], options?: PartialMatcherOp
     const partsCount = parts.length;
     const partRegexes = Array(partsCount);
     for (let j = 0; j < partsCount; j++) {
-      partRegexes[j] = picomatch.makeRe(parts[j], options);
+      partRegexes[j] = match.makeRe(parts[j], options);
     }
     regexes[i] = partRegexes;
   }
@@ -72,7 +72,7 @@ const splitPatternOptions = { parts: true };
 
 // if a pattern has no slashes outside glob symbols, results.parts is []
 export function splitPattern(path: string): string[] {
-  const result = picomatch.scan(path, splitPatternOptions);
+  const result = match.scan(path, splitPatternOptions);
   return result.parts?.length ? result.parts : [path];
 }
 // #endregion
@@ -129,7 +129,7 @@ export function isDynamicPattern(pattern: string, options?: { caseSensitiveMatch
     return true;
   }
 
-  const scan = picomatch.scan(pattern);
+  const scan = match.scan(pattern);
   return scan.isGlob || scan.negated;
 }
 // #endregion