Address code review feedback: improve CSS fallback logic and add cache size limit for picomatch

Copilot · sxzz · Copilot · commit f675a36717ab · 2026-01-03T17:06:10.000Z
Co-authored-by: sxzz &lt;6481596+sxzz@users.noreply.github.com&gt;
diff --git a/src/features/css.ts b/src/features/css.ts
@@ -111,12 +111,15 @@ export function CssCodeSplitPlugin(
 
       // Build an index of normalized chunk names for faster lookup
       const chunkNameIndex = new Map<string, string[]>()
+      const chunkFileNamesByBaseName = new Map<string, string>()
       for (const chunkFileName of chunkCSSMap.keys()) {
         const chunkBaseName = normalizeChunkFileName(chunkFileName)
         if (!chunkNameIndex.has(chunkBaseName)) {
           chunkNameIndex.set(chunkBaseName, [])
         }
         chunkNameIndex.get(chunkBaseName)!.push(chunkFileName)
+        // Store mapping from chunk file name to base name for prefix matching
+        chunkFileNamesByBaseName.set(chunkFileName, chunkBaseName)
       }
 
       // Match CSS assets to chunks by comparing base names
@@ -130,11 +133,22 @@ export function CssCodeSplitPlugin(
             break
           }
         } else {
-          // Fallback: check for prefix match
-          for (const [chunkFileName] of chunkCSSMap) {
-            if (chunkFileName.startsWith(`${cssBaseName}-`)) {
-              chunkCSSMap.get(chunkFileName)?.push(cssFileName)
-              break
+          // Fallback: check for prefix match by examining the base name index
+          let found = false
+          for (const [baseName, chunkFileNames] of chunkNameIndex) {
+            // Check if CSS file name could be a variant (e.g., with hash)
+            if (
+              baseName.startsWith(cssBaseName) ||
+              cssBaseName.startsWith(baseName)
+            ) {
+              for (const chunkFileName of chunkFileNames) {
+                if (chunkFileName.startsWith(`${cssBaseName}-`)) {
+                  chunkCSSMap.get(chunkFileName)?.push(cssFileName)
+                  found = true
+                  break
+                }
+              }
+              if (found) break
             }
           }
         }
diff --git a/src/utils/general.ts b/src/utils/general.ts
@@ -52,7 +52,9 @@ export function slash(string: string): string {
 export const noop = <T>(v: T): T => v
 
 // Cache picomatch matchers to avoid recompilation
+// Limit cache size to prevent memory leaks in long-running processes
 const picomatchers = new Map<string, ReturnType<typeof picomatch>>()
+const MAX_PICOMATCH_CACHE_SIZE = 500
 
 export function matchPattern(
   id: string,
@@ -69,6 +71,10 @@ export function matchPattern(
     let matcher = picomatchers.get(pattern)
     if (!matcher) {
       matcher = picomatch(pattern)
+      // Implement simple cache eviction: clear cache when it gets too large
+      if (picomatchers.size >= MAX_PICOMATCH_CACHE_SIZE) {
+        picomatchers.clear()
+      }
       picomatchers.set(pattern, matcher)
     }
     return matcher(id)
