chore: remove Matcher and isInclude method

Author: sonofmagic

.vscode/launch.json

@@ -19,63 +19,63 @@
       "cwd": "${workspaceFolder}/scripts/postcss7-compat"
     },
     {
-      "command": "yarn dev",
+      "command": "pnpm dev",
       "name": "[vite-vue] dev",
       "request": "launch",
       "type": "node-terminal",
       "cwd": "${workspaceFolder}/apps/vite-vue"
     },
     {
-      "command": "yarn build",
+      "command": "pnpm build",
       "name": "[vite-vue] build",
       "request": "launch",
       "type": "node-terminal",
       "cwd": "${workspaceFolder}/apps/vite-vue"
     },
     {
-      "command": "yarn dev",
+      "command": "pnpm dev",
       "name": "[vite-react] dev",
       "request": "launch",
       "type": "node-terminal",
       "cwd": "${workspaceFolder}/apps/vite-react"
     },
     {
-      "command": "yarn build",
+      "command": "pnpm build",
       "name": "[vite-react] build",
       "request": "launch",
       "type": "node-terminal",
       "cwd": "${workspaceFolder}/apps/vite-react"
     },
     {
-      "command": "yarn dev",
+      "command": "pnpm dev",
       "name": "[vite-vanilla] dev",
       "request": "launch",
       "type": "node-terminal",
       "cwd": "${workspaceFolder}/apps/vite-vanilla"
     },
     {
-      "command": "yarn build",
+      "command": "pnpm build",
       "name": "[vite-vanilla] build",
       "request": "launch",
       "type": "node-terminal",
       "cwd": "${workspaceFolder}/apps/vite-vanilla"
     },
     {
-      "command": "yarn dev",
+      "command": "pnpm dev",
       "name": "[webpack5-vue3] dev",
       "request": "launch",
       "type": "node-terminal",
       "cwd": "${workspaceFolder}/apps/webpack5-vue3"
     },
     {
-      "command": "yarn build",
+      "command": "pnpm build",
       "name": "[webpack5-vue3] build",
       "request": "launch",
       "type": "node-terminal",
       "cwd": "${workspaceFolder}/apps/webpack5-vue3"
     },
     {
-      "command": "yarn patch",
+      "command": "pnpm patch",
       "name": "do tailwindcss-patch",
       "request": "launch",
       "type": "node-terminal",

packages/core/package.json

@@ -61,17 +61,10 @@
     "fast-sort": "^3.4.0",
     "htmlparser2": "9.1.0",
     "magic-string": "^0.30.10",
-    "micromatch": "^4.0.7",
     "postcss": "^8.4.38",
     "postcss-selector-parser": "^6.1.0"
   },
   "devDependencies": {
-    "@types/babel__traverse": "^7.20.6",
-    "@types/micromatch": "^4.0.7",
-    "@vue/compiler-core": "^3.4.29",
-    "@vue/compiler-sfc": "^3.4.27"
-  },
-  "directories": {
-    "test": "test"
+    "@types/babel__traverse": "^7.20.6"
   }
 }

packages/core/src/ctx/index.ts

@@ -5,8 +5,8 @@ import { ClassGenerator } from '@tailwindcss-mangle/shared'
 import { getConfig } from '@tailwindcss-mangle/config'
 import type { MangleUserConfig } from '@tailwindcss-mangle/config'
 import { sort } from 'fast-sort'
-import defu from 'defu'
-import { createGlobMatcher, defaultMangleClassFilter, escapeStringRegexp } from '@/utils'
+import { defu } from 'defu'
+import { defaultMangleClassFilter, escapeStringRegexp } from '@/utils'
 
 interface InitConfigOptions {
   cwd?: string
@@ -16,8 +16,6 @@ interface InitConfigOptions {
 
 export class Context {
   options: MangleUserConfig
-  private includeMatcher: (file: string) => boolean
-  private excludeMatcher: (file: string) => boolean
   public replaceMap: Map<string, string>
   classSet: Set<string>
 
@@ -30,8 +28,6 @@ export class Context {
     this.options = {}
     this.classSet = new Set()
     this.replaceMap = new Map()
-    this.includeMatcher = () => true
-    this.excludeMatcher = () => false
     this.classGenerator = new ClassGenerator()
     this.preserveFunctionSet = new Set()
     this.preserveClassNamesSet = new Set()
@@ -53,19 +49,13 @@ export class Context {
   private mergeOptions(...opts: (MangleUserConfig | undefined)[]) {
     // 配置选项优先
     this.options = defu(this.options, ...opts)
-    this.includeMatcher = createGlobMatcher(this.options.include, true)
-    this.excludeMatcher = createGlobMatcher(this.options.exclude, false)
     this.classGenerator = new ClassGenerator(this.options.classGenerator)
     this.preserveFunctionSet = new Set(this.options?.preserveFunction ?? [])
     this.preserveFunctionRegexs = [...this.preserveFunctionSet.values()].map((x) => {
       return new RegExp(`${escapeStringRegexp(x)}\\(([^)]*)\\)`, 'g')
     })
   }
 
-  isInclude(file: string) {
-    return this.includeMatcher(file) && !this.excludeMatcher(file)
-  }
-
   currentMangleClassFilter(className: string) {
     return (this.options.mangleClassFilter ?? defaultMangleClassFilter)(className)
   }

packages/core/src/utils.ts

@@ -1,23 +1,8 @@
-import micromatch from 'micromatch'
-
-const { isMatch } = micromatch
-
 export function escapeStringRegexp(str: string) {
   if (typeof str !== 'string') {
     throw new TypeError('Expected a string')
   }
   return str.replaceAll(/[$()*+.?[\\\]^{|}]/g, '\\$&').replaceAll('-', '\\x2d')
 }
 
-export function createGlobMatcher(pattern: string | string[] | undefined, fallbackValue: boolean = false) {
-  if (pattern === undefined) {
-    return function () {
-      return fallbackValue
-    }
-  }
-  return function (file: string) {
-    return isMatch(file, pattern)
-  }
-}
-
 export { defaultMangleClassFilter, isMap, isRegexp } from '@tailwindcss-mangle/shared'

packages/unplugin-tailwindcss-mangle/package.json

@@ -76,6 +76,7 @@
     "test:dev": "vitest"
   },
   "dependencies": {
+    "@rollup/pluginutils": "^5.1.0",
     "@tailwindcss-mangle/config": "workspace:^",
     "@tailwindcss-mangle/core": "workspace:^",
     "@tailwindcss-mangle/shared": "workspace:^",