fix unocss scan watch

didi · Nov 22, 2023 · a410486 · a410486
1 parent 5460efb
commit a410486
Showing 1 changed file with 5 additions and 8 deletions.
diff --git a/packages/unocss-plugin/lib/index.js b/packages/unocss-plugin/lib/index.js
@@ -56,7 +56,7 @@ function normalizeRules (rules, root) {
     rules = [rules]
   }
   return rules.map((rule) => {
-    if (rule instanceof RegExp) {
+    if (typeof rule.test === 'function') {
       return rule
     }
     if (typeof rule === 'string') {
@@ -126,6 +126,9 @@ function normalizeOptions (options) {
     ...escapeMap
   }
 
+  scan.include = normalizeRules(scan.include, root)
+  scan.exclude = normalizeRules(scan.exclude, root)
+
   return {
     unoFile,
     styleIsolation,
@@ -374,19 +377,13 @@ class MpxUnocssPlugin {
           assets[file] = source
         }
 
-        // normalize scan
-        const scan = this.options.scan
-        const root = this.options.root
-        scan.include = normalizeRules(scan.include, root)
-        scan.exclude = normalizeRules(scan.exclude, root)
-
         await Promise.all(Object.entries(assets).map(([file, source]) => {
           if (file.endsWith(styleExt) || file.endsWith(templateExt)) {
             const assetModules = assetsModulesMap.get(file)
             if (has(assetModules, (module) => {
               if (module.resource) {
                 const resourcePath = toPosix(parseRequest(module.resource).resourcePath)
-                return filterFile(resourcePath, scan)
+                return filterFile(resourcePath, this.options.scan)
               }
               return false
             })) {