refactor: use hook filters in internal plugins

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-commonjs, @rollup/plugin-dynamic-import-vars, @rollup/pluginutils
 License: MIT
 By: Johannes Stein

packages/vite/package.json

@@ -97,6 +97,7 @@
     "@jridgewell/trace-mapping": "^0.3.29",
     "@oxc-project/types": "0.77.0",
     "@polka/compression": "^1.0.0-next.25",
+    "@rolldown/pluginutils": "^1.0.0-beta.21",
     "@rollup/plugin-alias": "^5.1.1",
     "@rollup/plugin-commonjs": "^28.0.6",
     "@rollup/plugin-dynamic-import-vars": "2.1.4",

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

@@ -166,13 +166,14 @@ export function assetPlugin(config: ResolvedConfig): Plugin {
     },
 
     load: {
-      async handler(id) {
-        if (id[0] === '\0') {
+      filter: {
+        id: {
           // Rollup convention, this id should be handled by the
           // plugin that marked it with \0
-          return
-        }
-
+          exclude: /^\0/,
+        },
+      },
+      async handler(id) {
         // raw requests, read from disk
         if (rawRE.test(id)) {
           const file = checkPublicFile(id, config) || cleanUrl(id)

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 {
@@ -50,123 +51,121 @@ export function assetImportMetaUrlPlugin(config: ResolvedConfig): Plugin {
     },
 
     transform: {
+      filter: {
+        id: {
+          exclude: [exactRegex(preloadHelperId), exactRegex(CLIENT_ENTRY)],
+        },
+        code: /new\s+URL.+import\.meta\.url/,
+      },
       async handler(code, id) {
-        if (
-          id !== preloadHelperId &&
-          id !== CLIENT_ENTRY &&
-          code.includes('new URL') &&
-          code.includes(`import.meta.url`)
-        ) {
-          let s: MagicString | undefined
-          const assetImportMetaUrlRE =
-            /\bnew\s+URL\s*\(\s*('[^']+'|"[^"]+"|`[^`]+`)\s*,\s*import\.meta\.url\s*(?:,\s*)?\)/dg
-          const cleanString = stripLiteral(code)
-
-          let match: RegExpExecArray | null
-          while ((match = assetImportMetaUrlRE.exec(cleanString))) {
-            const [[startIndex, endIndex], [urlStart, urlEnd]] = match.indices!
-            if (hasViteIgnoreRE.test(code.slice(startIndex, urlStart))) continue
+        let s: MagicString | undefined
+        const assetImportMetaUrlRE =
+          /\bnew\s+URL\s*\(\s*('[^']+'|"[^"]+"|`[^`]+`)\s*,\s*import\.meta\.url\s*(?:,\s*)?\)/dg
+        const cleanString = stripLiteral(code)
 
-            const rawUrl = code.slice(urlStart, urlEnd)
+        let match: RegExpExecArray | null
+        while ((match = assetImportMetaUrlRE.exec(cleanString))) {
+          const [[startIndex, endIndex], [urlStart, urlEnd]] = match.indices!
+          if (hasViteIgnoreRE.test(code.slice(startIndex, urlStart))) continue
 
-            if (!s) s = new MagicString(code)
+          const rawUrl = code.slice(urlStart, urlEnd)
 
-            // potential dynamic template string
-            if (rawUrl[0] === '`' && rawUrl.includes('${')) {
-              const queryDelimiterIndex = getQueryDelimiterIndex(rawUrl)
-              const hasQueryDelimiter = queryDelimiterIndex !== -1
-              const pureUrl = hasQueryDelimiter
-                ? rawUrl.slice(0, queryDelimiterIndex) + '`'
-                : rawUrl
-              const queryString = hasQueryDelimiter
-                ? rawUrl.slice(queryDelimiterIndex, -1)
-                : ''
-              const ast = this.parse(pureUrl)
-              const templateLiteral = (ast as any).body[0].expression
-              if (templateLiteral.expressions.length) {
-                const pattern = buildGlobPattern(templateLiteral)
-                if (pattern.startsWith('*')) {
-                  // don't transform for patterns like this
-                  // because users won't intend to do that in most cases
-                  continue
-                }
+          if (!s) s = new MagicString(code)
 
-                const globOptions = {
-                  eager: true,
-                  import: 'default',
-                  // A hack to allow 'as' & 'query' exist at the same time
-                  query: injectQuery(queryString, 'url'),
-                }
-                s.update(
-                  startIndex,
-                  endIndex,
-                  `new URL((import.meta.glob(${JSON.stringify(
-                    pattern,
-                  )}, ${JSON.stringify(
-                    globOptions,
-                  )}))[${pureUrl}], import.meta.url)`,
-                )
+          // potential dynamic template string
+          if (rawUrl[0] === '`' && rawUrl.includes('${')) {
+            const queryDelimiterIndex = getQueryDelimiterIndex(rawUrl)
+            const hasQueryDelimiter = queryDelimiterIndex !== -1
+            const pureUrl = hasQueryDelimiter
+              ? rawUrl.slice(0, queryDelimiterIndex) + '`'
+              : rawUrl
+            const queryString = hasQueryDelimiter
+              ? rawUrl.slice(queryDelimiterIndex, -1)
+              : ''
+            const ast = this.parse(pureUrl)
+            const templateLiteral = (ast as any).body[0].expression
+            if (templateLiteral.expressions.length) {
+              const pattern = buildGlobPattern(templateLiteral)
+              if (pattern.startsWith('*')) {
+                // don't transform for patterns like this
+                // because users won't intend to do that in most cases
                 continue
               }
-            }
 
-            const url = rawUrl.slice(1, -1)
-            if (isDataUrl(url)) {
+              const globOptions = {
+                eager: true,
+                import: 'default',
+                // A hack to allow 'as' & 'query' exist at the same time
+                query: injectQuery(queryString, 'url'),
+              }
+              s.update(
+                startIndex,
+                endIndex,
+                `new URL((import.meta.glob(${JSON.stringify(
+                  pattern,
+                )}, ${JSON.stringify(
+                  globOptions,
+                )}))[${pureUrl}], import.meta.url)`,
+              )
               continue
             }
-            let file: string | undefined
-            if (url[0] === '.') {
-              file = slash(path.resolve(path.dirname(id), url))
-              file = tryFsResolve(file, fsResolveOptions) ?? file
-            } else {
-              assetResolver ??= createBackCompatIdResolver(config, {
-                extensions: [],
-                mainFields: [],
-                tryIndex: false,
-                preferRelative: true,
-              })
-              file = await assetResolver(this.environment, url, id)
-              file ??=
-                url[0] === '/'
-                  ? slash(path.join(publicDir, url))
-                  : slash(path.resolve(path.dirname(id), url))
-            }
+          }
 
-            // Get final asset URL. If the file does not exist,
-            // we fall back to the initial URL and let it resolve in runtime
-            let builtUrl: string | undefined
-            if (file) {
-              try {
-                if (publicDir && isParentDirectory(publicDir, file)) {
-                  const publicPath = '/' + path.posix.relative(publicDir, file)
-                  builtUrl = await fileToUrl(this, publicPath)
-                } else {
-                  this.addWatchFile(file)
-                  builtUrl = await fileToUrl(this, file)
-                }
-              } catch {
-                // do nothing, we'll log a warning after this
+          const url = rawUrl.slice(1, -1)
+          if (isDataUrl(url)) {
+            continue
+          }
+          let file: string | undefined
+          if (url[0] === '.') {
+            file = slash(path.resolve(path.dirname(id), url))
+            file = tryFsResolve(file, fsResolveOptions) ?? file
+          } else {
+            assetResolver ??= createBackCompatIdResolver(config, {
+              extensions: [],
+              mainFields: [],
+              tryIndex: false,
+              preferRelative: true,
+            })
+            file = await assetResolver(this.environment, url, id)
+            file ??=
+              url[0] === '/'
+                ? slash(path.join(publicDir, url))
+                : slash(path.resolve(path.dirname(id), url))
+          }
+
+          // Get final asset URL. If the file does not exist,
+          // we fall back to the initial URL and let it resolve in runtime
+          let builtUrl: string | undefined
+          if (file) {
+            try {
+              if (publicDir && isParentDirectory(publicDir, file)) {
+                const publicPath = '/' + path.posix.relative(publicDir, file)
+                builtUrl = await fileToUrl(this, publicPath)
+              } else {
+                this.addWatchFile(file)
+                builtUrl = await fileToUrl(this, file)
               }
+            } catch {
+              // do nothing, we'll log a warning after this
             }
-            if (!builtUrl) {
-              const rawExp = code.slice(startIndex, endIndex)
-              config.logger.warnOnce(
-                `\n${rawExp} doesn't exist at build time, it will remain unchanged to be resolved at runtime. ` +
-                  `If this is intended, you can use the /* @vite-ignore */ comment to suppress this warning.`,
-              )
-              builtUrl = url
-            }
-            s.update(
-              startIndex,
-              endIndex,
-              `new URL(${JSON.stringify(builtUrl)}, import.meta.url)`,
-            )
           }
-          if (s) {
-            return transformStableResult(s, id, config)
+          if (!builtUrl) {
+            const rawExp = code.slice(startIndex, endIndex)
+            config.logger.warnOnce(
+              `\n${rawExp} doesn't exist at build time, it will remain unchanged to be resolved at runtime. ` +
+                `If this is intended, you can use the /* @vite-ignore */ comment to suppress this warning.`,
+            )
+            builtUrl = url
           }
+          s.update(
+            startIndex,
+            endIndex,
+            `new URL(${JSON.stringify(builtUrl)}, import.meta.url)`,
+          )
+        }
+        if (s) {
+          return transformStableResult(s, id, config)
         }
-        return null
       },
     },
   }

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

@@ -334,9 +334,10 @@ export function cssPlugin(config: ResolvedConfig): Plugin {
     },
 
     load: {
+      filter: {
+        id: CSS_LANGS_RE,
+      },
       async handler(id) {
-        if (!isCSSRequest(id)) return
-
         if (urlRE.test(id)) {
           if (isModuleCSSRequest(id)) {
             throw new Error(
@@ -361,15 +362,13 @@ export function cssPlugin(config: ResolvedConfig): Plugin {
       },
     },
     transform: {
+      filter: {
+        id: {
+          include: CSS_LANGS_RE,
+          exclude: [commonjsProxyRE, SPECIAL_QUERY_RE],
+        },
+      },
       async handler(raw, id) {
-        if (
-          !isCSSRequest(id) ||
-          commonjsProxyRE.test(id) ||
-          SPECIAL_QUERY_RE.test(id)
-        ) {
-          return
-        }
-
         const { environment } = this
         const resolveUrl = (url: string, importer?: string) =>
           idResolver(environment, url, importer)
@@ -509,15 +508,13 @@ export function cssPostPlugin(config: ResolvedConfig): Plugin {
     },
 
     transform: {
+      filter: {
+        id: {
+          include: CSS_LANGS_RE,
+          exclude: [commonjsProxyRE, SPECIAL_QUERY_RE],
+        },
+      },
       async handler(css, id) {
-        if (
-          !isCSSRequest(id) ||
-          commonjsProxyRE.test(id) ||
-          SPECIAL_QUERY_RE.test(id)
-        ) {
-          return
-        }
-
         css = stripBomTag(css)
 
         // cache css compile result to map
@@ -1073,15 +1070,13 @@ export function cssAnalysisPlugin(config: ResolvedConfig): Plugin {
     name: 'vite:css-analysis',
 
     transform: {
+      filter: {
+        id: {
+          include: CSS_LANGS_RE,
+          exclude: [commonjsProxyRE, SPECIAL_QUERY_RE],
+        },
+      },
       async handler(_, id) {
-        if (
-          !isCSSRequest(id) ||
-          commonjsProxyRE.test(id) ||
-          SPECIAL_QUERY_RE.test(id)
-        ) {
-          return
-        }
-
         const { moduleGraph } = this.environment as DevEnvironment
         const thisModule = moduleGraph.getModuleById(id)