refactor: use utils from @rolldown/pluginutils

Author: sapphi-red

packages/common/filter-utils.ts

@@ -1,3 +1,2 @@
-export * from './filter-utils'
 export * from './refresh-utils'
 export * from './warning'

packages/common/index.ts

@@ -46,5 +46,8 @@
     "@vitejs/react-common": "workspace:*",
     "unbuild": "^3.5.0",
     "vite": "catalog:rolldown-vite"
+  },
+  "dependencies": {
+    "@rolldown/pluginutils": "1.0.0-beta.9"
   }
 }

packages/plugin-react-oxc/package.json

@@ -5,11 +5,11 @@ import type { BuildOptions, Plugin, PluginOption } from 'vite'
 import {
   addRefreshWrapper,
   avoidSourceMapOption,
-  exactRegex,
   getPreambleCode,
   runtimePublicPath,
   silenceUseClientWarning,
 } from '@vitejs/react-common'
+import { exactRegex } from '@rolldown/pluginutils'
 
 const _dirname = dirname(fileURLToPath(import.meta.url))
 

packages/plugin-react-oxc/src/index.ts

@@ -29,6 +29,7 @@
   },
   "homepage": "https://github.com/vitejs/vite-plugin-react/tree/main/packages/plugin-react-swc#readme",
   "dependencies": {
+    "@rolldown/pluginutils": "1.0.0-beta.9",
     "@swc/core": "^1.11.22"
   },
   "peerDependencies": {

packages/plugin-react-swc/package.json

@@ -14,11 +14,11 @@ import {
 import type { PluginOption } from 'vite'
 import {
   addRefreshWrapper,
-  exactRegex,
   getPreambleCode,
   runtimePublicPath,
   silenceUseClientWarning,
 } from '@vitejs/react-common'
+import { exactRegex } from '@rolldown/pluginutils'
 
 /* eslint-disable no-restricted-globals */
 const _dirname =

packages/plugin-react-swc/src/index.ts

@@ -51,6 +51,7 @@
     "@babel/core": "^7.26.10",
     "@babel/plugin-transform-react-jsx-self": "^7.25.9",
     "@babel/plugin-transform-react-jsx-source": "^7.25.9",
+    "@rolldown/pluginutils": "1.0.0-beta.9",
     "@types/babel__core": "^7.20.5",
     "react-refresh": "^0.17.0"
   },

packages/plugin-react/package.json

@@ -8,12 +8,15 @@ import * as vite from 'vite'
 import type { Plugin, PluginOption, ResolvedConfig } from 'vite'
 import {
   addRefreshWrapper,
-  exactRegex,
   getPreambleCode,
   preambleCode,
   runtimePublicPath,
   silenceUseClientWarning,
 } from '@vitejs/react-common'
+import {
+  exactRegex,
+  makeIdFiltersToMatchWithQuery,
+} from '@rolldown/pluginutils'
 
 const _dirname = dirname(fileURLToPath(import.meta.url))
 
@@ -198,9 +201,11 @@ export default function viteReact(opts: Options = {}): PluginOption[] {
     transform: {
       filter: {
         id: {
-          include: ensureArray(include).map(matchWithQuery),
+          include: makeIdFiltersToMatchWithQuery(include),
           exclude: [
-            ...(exclude ? ensureArray(exclude).map(matchWithQuery) : []),
+            ...(exclude
+              ? makeIdFiltersToMatchWithQuery(ensureArray(exclude))
+              : []),
             /\/node_modules\//,
           ],
         },
@@ -448,18 +453,3 @@ function getReactCompilerRuntimeModule(
 function ensureArray<T>(value: T | T[]): T[] {
   return Array.isArray(value) ? value : [value]
 }
-
-function matchWithQuery(input: string | RegExp) {
-  if (typeof input === 'string') {
-    return `${input}{?*,}`
-  }
-  return addQueryToRegex(input)
-}
-
-function addQueryToRegex(input: RegExp) {
-  return new RegExp(
-    // replace `$` with `(?:\?.*)?$` (ignore `\$`)
-    input.source.replace(/(?<!\\)\$/g, '(?:\\?.*)?$'),
-    input.flags,
-  )
-}