refactor: use util functions from @rolldown/pluginutils (#166)

Author: sapphi-red

packages/vite/LICENSE.md

@@ -360,6 +360,38 @@ Repository: lukeed/polka
 
 ---------------------------------------
 
+## @rolldown/pluginutils
+License: MIT
+Repository: git+https://github.com/rolldown/rolldown.git
+
+> MIT License
+> 
+> Copyright (c) 2024-present VoidZero Inc. & Contributors
+> 
+> Permission is hereby granted, free of charge, to any person obtaining a copy
+> of this software and associated documentation files (the "Software"), to deal
+> in the Software without restriction, including without limitation the rights
+> to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+> copies of the Software, and to permit persons to whom the Software is
+> furnished to do so, subject to the following conditions:
+> 
+> The above copyright notice and this permission notice shall be included in all
+> copies or substantial portions of the Software.
+> 
+> THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+> IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+> FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+> AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+> LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+> OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+> SOFTWARE.
+> 
+> end of terms and conditions
+> 
+> The licenses of externally maintained libraries from which parts of the Software is derived are listed [here](https://github.com/rolldown/rolldown/blob/main/THIRD-PARTY-LICENSE).
+
+---------------------------------------
+
 ## @rollup/plugin-alias, @rollup/plugin-dynamic-import-vars, @rollup/pluginutils
 License: MIT
 By: Johannes Stein

packages/vite/package.json

@@ -102,6 +102,7 @@
     "@jridgewell/trace-mapping": "^0.3.25",
     "@oxc-project/types": "0.69.0",
     "@polka/compression": "^1.0.0-next.25",
+    "@rolldown/pluginutils": "1.0.0-beta.8-commit.8951737",
     "@rollup/plugin-alias": "^5.1.1",
     "@rollup/plugin-commonjs": "^28.0.3",
     "@rollup/plugin-dynamic-import-vars": "2.1.4",

packages/vite/src/node/optimizer/rolldownDepPlugin.ts

@@ -1,5 +1,6 @@
 import path from 'node:path'
 import type { ImportKind, Plugin, RolldownPlugin } from 'rolldown'
+import { prefixRegex } from '@rolldown/pluginutils'
 import { JS_TYPES_RE, KNOWN_ASSET_TYPES } from '../constants'
 import type { PackageCache } from '../packages'
 import {
@@ -189,7 +190,7 @@ export function rolldownDepPlugin(
       },
       load: {
         filter: {
-          id: new RegExp(`^${externalWithConversionNamespace}`),
+          id: prefixRegex(externalWithConversionNamespace),
         },
         handler(id) {
           const path = id.slice(externalWithConversionNamespace.length)
@@ -246,8 +247,8 @@ export function rolldownDepPlugin(
       load: {
         filter: {
           id: [
-            new RegExp(`^${browserExternalNamespace}`),
-            new RegExp(`^${optionalPeerDepNamespace}`),
+            prefixRegex(browserExternalNamespace),
+            prefixRegex(optionalPeerDepNamespace),
           ],
         },
         handler(id) {
@@ -324,7 +325,7 @@ export function rolldownCjsExternalPlugin(
   return {
     name: 'cjs-external',
     resolveId: {
-      filter: { id: [new RegExp(`^${nonFacadePrefix}`), filter] },
+      filter: { id: [prefixRegex(nonFacadePrefix), filter] },
       handler(id, _importer, options) {
         if (id.startsWith(nonFacadePrefix)) {
           return {
@@ -350,7 +351,7 @@ export function rolldownCjsExternalPlugin(
       },
     },
     load: {
-      filter: { id: [new RegExp(`^${cjsExternalFacadeNamespace}`)] },
+      filter: { id: prefixRegex(cjsExternalFacadeNamespace) },
       handler(id) {
         if (id.startsWith(cjsExternalFacadeNamespace)) {
           return {

packages/vite/src/node/plugins/asset.ts

@@ -10,6 +10,7 @@ import type {
 import MagicString from 'magic-string'
 import colors from 'picocolors'
 import picomatch from 'picomatch'
+import { makeIdFiltersToMatchWithQuery } from '@rolldown/pluginutils'
 import {
   createToImportMetaURLBasedRelativeRuntime,
   toOutputFilePathInJS,
@@ -162,10 +163,8 @@ export function assetPlugin(config: ResolvedConfig): Plugin {
         id: [
           urlRE,
           DEFAULT_ASSETS_RE,
-          ...config.rawAssetsInclude.map((v) =>
-            typeof v === 'string'
-              ? picomatch.makeRe(`${v}{?*,}`, { dot: true })
-              : addQueryToRegex(v),
+          ...makeIdFiltersToMatchWithQuery(config.rawAssetsInclude).map((v) =>
+            typeof v === 'string' ? picomatch.makeRe(v, { dot: true }) : v,
           ),
         ],
       },
@@ -189,9 +188,7 @@ export function assetPlugin(config: ResolvedConfig): Plugin {
             rawRE,
             urlRE,
             DEFAULT_ASSETS_RE,
-            ...config.rawAssetsInclude.map((v) =>
-              typeof v === 'string' ? `${v}{?*,}` : addQueryToRegex(v),
-            ),
+            ...makeIdFiltersToMatchWithQuery(config.rawAssetsInclude),
           ],
           // Rollup convention, this id should be handled by the
           // plugin that marked it with \0
@@ -307,14 +304,6 @@ export function assetPlugin(config: ResolvedConfig): Plugin {
   }
 }
 
-function addQueryToRegex(input: RegExp) {
-  return new RegExp(
-    // replace `$` with `(?:\?.*)?$` (ignore `\$`)
-    input.source.replace(/(?<!\\)\$/g, '(?:\\?.*)?$'),
-    input.flags,
-  )
-}
-
 export async function fileToUrl(
   pluginContext: PluginContext,
   id: string,

packages/vite/src/node/plugins/assetImportMetaUrl.ts

@@ -1,6 +1,7 @@
 import path from 'node:path'
 import MagicString from 'magic-string'
 import { stripLiteral } from 'strip-literal'
+import { exactRegex } from '@rolldown/pluginutils'
 import type { Plugin } from '../plugin'
 import type { ResolvedConfig } from '../config'
 import {
@@ -52,7 +53,7 @@ export function assetImportMetaUrlPlugin(config: ResolvedConfig): Plugin {
     transform: {
       filter: {
         id: {
-          exclude: [preloadHelperId, CLIENT_ENTRY],
+          exclude: [exactRegex(preloadHelperId), exactRegex(CLIENT_ENTRY)],
         },
         code: /new\s+URL.+import\.meta\.url/,
       },

packages/vite/src/node/plugins/dynamicImportVars.ts

@@ -4,13 +4,13 @@ import { init, parse as parseImports } from 'es-module-lexer'
 import type { ImportSpecifier } from 'es-module-lexer'
 import { parseAst } from 'rolldown/parseAst'
 import { dynamicImportToGlob } from '@rollup/plugin-dynamic-import-vars'
+import { exactRegex } from '@rolldown/pluginutils'
 import type { Plugin } from '../plugin'
 import type { ResolvedConfig } from '../config'
 import { CLIENT_ENTRY } from '../constants'
 import { createBackCompatIdResolver } from '../idResolver'
 import {
   createFilter,
-  exactRegex,
   normalizePath,
   rawRE,
   requestQueryMaybeEscapedSplitRE,
@@ -201,7 +201,7 @@ export function dynamicImportVarsPlugin(config: ResolvedConfig): Plugin {
 
     transform: {
       filter: {
-        id: { exclude: CLIENT_ENTRY },
+        id: { exclude: exactRegex(CLIENT_ENTRY) },
         code: hasDynamicImportRE,
       },
       async handler(source, importer) {

packages/vite/src/node/plugins/importAnalysisBuild.ts

@@ -9,9 +9,9 @@ import type { SourceMap } from 'rolldown'
 import { buildImportAnalysisPlugin as nativeBuildImportAnalysisPlugin } from 'rolldown/experimental'
 import type { RawSourceMap } from '@ampproject/remapping'
 import convertSourceMap from 'convert-source-map'
+import { exactRegex } from '@rolldown/pluginutils'
 import {
   combineSourcemaps,
-  exactRegex,
   generateCodeFrame,
   isInNodeModules,
   numberToPos,

packages/vite/src/node/plugins/modulePreloadPolyfill.ts

@@ -1,6 +1,6 @@
+import { exactRegex } from '@rolldown/pluginutils'
 import type { ResolvedConfig } from '..'
 import type { Plugin } from '../plugin'
-import { exactRegex } from '../utils'
 import { isModernFlag } from './importAnalysisBuild'
 
 export const modulePreloadPolyfillId = 'vite/modulepreload-polyfill'

packages/vite/src/node/plugins/oxc.ts

@@ -11,6 +11,7 @@ import { rolldown } from 'rolldown'
 import type { FSWatcher } from 'dep-types/chokidar'
 import { TSConfckParseError } from 'tsconfck'
 import colors from 'picocolors'
+import { exactRegex, prefixRegex } from '@rolldown/pluginutils'
 import {
   combineSourcemaps,
   createFilter,
@@ -318,7 +319,7 @@ export function oxcPlugin(config: ResolvedConfig): Plugin {
     },
     resolveId: {
       filter: {
-        id: /^@oxc-project\/runtime\//,
+        id: prefixRegex('@oxc-project/runtime/'),
       },
       async handler(id, _importer, opts) {
         // @oxc-project/runtime imports will be injected by OXC transform
@@ -501,11 +502,11 @@ async function generateRuntimeHelpers(
       {
         name: 'entrypoint',
         resolveId: {
-          filter: { id: /^entrypoint$/ },
+          filter: { id: exactRegex('entrypoint') },
           handler: (id) => id,
         },
         load: {
-          filter: { id: /^entrypoint$/ },
+          filter: { id: exactRegex('entrypoint') },
           handler() {
             return runtimeHelpers
               .map(

packages/vite/src/node/plugins/resolve.ts

@@ -6,6 +6,7 @@ import type { PartialResolvedId } from 'rolldown'
 import { viteResolvePlugin } from 'rolldown/experimental'
 import { exports, imports } from 'resolve.exports'
 import { hasESMSyntax } from 'mlly'
+import { prefixRegex } from '@rolldown/pluginutils'
 import type { Plugin } from '../plugin'
 import {
   CLIENT_ENTRY,
@@ -750,10 +751,7 @@ export function resolvePlugin(
 
     load: {
       filter: {
-        id: [
-          new RegExp(`^${browserExternalId}`),
-          new RegExp(`^${optionalPeerDepId}`),
-        ],
+        id: [prefixRegex(browserExternalId), prefixRegex(optionalPeerDepId)],
       },
       handler(id) {
         if (id.startsWith(browserExternalId)) {