fix: lazy hook filter should work (#21443)

Author: sapphi-red

packages/vite/src/node/build.ts

@@ -1292,10 +1292,8 @@ function wrapEnvironmentResolveId(
   }
 
   if ('handler' in hook) {
-    return {
-      ...hook,
-      handler,
-    } as Plugin['resolveId']
+    hook.handler = handler
+    return hook
   } else {
     return handler
   }
@@ -1318,10 +1316,8 @@ function wrapEnvironmentLoad(
   }
 
   if ('handler' in hook) {
-    return {
-      ...hook,
-      handler,
-    } as Plugin['load']
+    hook.handler = handler
+    return hook
   } else {
     return handler
   }
@@ -1345,10 +1341,8 @@ function wrapEnvironmentTransform(
   }
 
   if ('handler' in hook) {
-    return {
-      ...hook,
-      handler,
-    } as Plugin['transform']
+    hook.handler = handler
+    return hook
   } else {
     return handler
   }
@@ -1388,10 +1382,8 @@ function wrapEnvironmentHook<HookName extends keyof Plugin>(
   }
 
   if ('handler' in hook) {
-    return {
-      ...hook,
-      handler,
-    } as Plugin[HookName]
+    hook.handler = handler
+    return hook
   } else {
     return handler
   }

playground/transform-plugin/__tests__/transform-plugin.spec.ts

@@ -9,4 +9,8 @@ test('module type should be supported', async () => {
   expect(await page.textContent('#module-type-json-virtual-post')).toBe('js')
 })
 
+test('lazy hook filter should be applied', async () => {
+  expect(await page.textContent('#lazy-hook-filter')).toBe('success')
+})
+
 tests()

playground/transform-plugin/index.html

@@ -9,4 +9,7 @@ <h2>Module Type</h2>
 <div id="module-type-json-virtual-pre"></div>
 <div id="module-type-json-virtual-post"></div>
 
+<h2>Lazy Hook Filter</h2>
+<div id="lazy-hook-filter"></div>
+
 <script type="module" src="./index.js"></script>

playground/transform-plugin/index.js

@@ -13,3 +13,7 @@ document.getElementById('module-type-json-virtual-pre').innerHTML =
   barJson.moduleTypePre
 document.getElementById('module-type-json-virtual-post').innerHTML =
   barJson.moduleTypePost
+
+// 'LAZY_HOOK_FILTER_CONTENT' is replaced by lazy-hook-filter plugin
+document.getElementById('lazy-hook-filter').innerHTML =
+  'LAZY_HOOK_FILTER_CONTENT'

playground/transform-plugin/vite.config.js

@@ -59,6 +59,21 @@ const moduleTypePlugins = [
   },
 ]
 
+const lazyHookFilterPlugin = {
+  name: 'lazy-hook-filter',
+  options() {
+    lazyHookFilterPlugin.transform.filter = { id: '**/index.js' }
+  },
+  transform: {
+    filter: /** @type {import('vite').Rolldown.HookFilter} */ ({
+      id: { exclude: ['**/*.js'] },
+    }),
+    handler(code) {
+      return code.replaceAll('LAZY_HOOK_FILTER_CONTENT', 'success')
+    },
+  },
+}
+
 export default defineConfig({
-  plugins: [transformPlugin, moduleTypePlugins],
+  plugins: [transformPlugin, moduleTypePlugins, lazyHookFilterPlugin],
 })