🎨 Switch to picomatch

SpyglassMC · Jan 3, 2025 · b3d28de · b3d28de
1 parent da865cd
commit b3d28de
Show file tree

Hide file tree

Showing 4 changed files with 44 additions and 40 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/packages/core/package.json b/packages/core/package.json
@@ -19,7 +19,7 @@
     "chokidar": "^3.5.2",
     "decompress": "^4.2.1",
     "follow-redirects": "^1.14.8",
-    "micromatch": "^4.0.8",
+    "picomatch": "^4.0.2",
     "pako": "^2.0.4",
     "rfdc": "^1.3.0",
     "vscode-languageserver-textdocument": "^1.0.4",
@@ -28,7 +28,7 @@
   "devDependencies": {
     "@types/decompress": "^4.2.3",
     "@types/follow-redirects": "^1.14.1",
-    "@types/micromatch": "^4.0.9",
+    "@types/picomatch": "^3.0.1",
     "@types/pako": "^2.0.0",
     "@types/whatwg-url": "^11.0.4"
   },

diff --git a/packages/core/src/service/Config.ts b/packages/core/src/service/Config.ts
@@ -336,7 +336,11 @@ export const VanillaConfig: Config = {
 	env: {
 		dataSource: 'GitHub',
 		dependencies: ['@vanilla-datapack', '@vanilla-resourcepack', '@vanilla-mcdoc'],
-		exclude: ['.*/**'],
+		exclude: [
+			'.*/**',
+			'**/node_modules/**',
+			'**/__pycache__/**',
+		],
 		customResources: {},
 		feature: {
 			codeActions: true,

diff --git a/packages/core/src/service/Project.ts b/packages/core/src/service/Project.ts
@@ -1,4 +1,4 @@
-import * as micromatch from 'micromatch'
+import picomatch from 'picomatch'
 import type { TextDocumentContentChangeEvent } from 'vscode-languageserver-textdocument'
 import { TextDocument } from 'vscode-languageserver-textdocument'
 import type { ExternalEventEmitter, Externals, FsWatcher, IntervalId } from '../common/index.js'
@@ -972,7 +972,7 @@ export class Project implements ExternalEventEmitter {
 			return false
 		}
 		for (const rel of fileUtil.getRels(uri, this.projectRoots)) {
-			if (micromatch.any(rel, this.config.env.exclude)) {
+			if (picomatch(this.config.env.exclude, { dot: true, posixSlashes: false })(rel)) {
 				return true
 			}
 		}