fix(esbuild): pass original build for custom esbuild setup

sxzz · sxzz · commit 24a7188665d1 · 2025-01-08T13:08:38.000+08:00
backport 4abab22
diff --git a/src/esbuild/index.ts b/src/esbuild/index.ts
@@ -71,7 +71,7 @@ export function getEsbuildPlugin<UserOptions = Record<string, never>>(
             loader.options ||= _options
             loader.onTransformCb = callback
           },
-        } as EsbuildPluginBuild)
+        } as EsbuildPluginBuild, build)
 
         // skip if no load & transform hooks
         if (loader.onLoadCb || loader.onTransformCb)
@@ -140,9 +140,9 @@ export function getEsbuildPlugin<UserOptions = Record<string, never>>(
 }
 
 function buildSetup(meta: UnpluginContextMeta & { framework: 'esbuild' }) {
-  return (plugin: UnpluginOptions): EsbuildPlugin['setup'] => {
-    return (_build) => {
-      const build = meta.build = _build as EsbuildPluginBuild
+  return (plugin: UnpluginOptions) => {
+    return (build: EsbuildPluginBuild, rawBuild: PluginBuild) => {
+      meta.build = build
       const context = createBuildContext(build)
       const { onStart, onEnd, onResolve, onLoad, onTransform, initialOptions } = build
 
@@ -306,7 +306,7 @@ function buildSetup(meta: UnpluginContextMeta & { framework: 'esbuild' }) {
       }
 
       if (plugin.esbuild?.setup)
-        return plugin.esbuild.setup(meta.build)
+        return plugin.esbuild.setup(rawBuild)
     }
   }
 }
diff --git a/src/types.ts b/src/types.ts
@@ -1,6 +1,6 @@
 import type { CompilationContext as FarmCompilationContext, JsPlugin as FarmPlugin } from '@farmfe/core'
 import type { Compilation as RspackCompilation, Compiler as RspackCompiler, LoaderContext as RspackLoaderContext, RspackPluginInstance } from '@rspack/core'
-import type { BuildOptions, Plugin as EsbuildPlugin, Loader } from 'esbuild'
+import type { BuildOptions, Plugin as EsbuildPlugin, Loader, PluginBuild } from 'esbuild'
 import type { Plugin as RolldownPlugin } from 'rolldown'
 import type { AstNode, EmittedAsset, PluginContextMeta as RollupContextMeta, Plugin as RollupPlugin, SourceMapInput } from 'rollup'
 import type { Plugin as VitePlugin } from 'vite'
@@ -90,7 +90,7 @@ export interface UnpluginOptions {
     // using regexp in esbuild improves performance
     onResolveFilter?: RegExp
     onLoadFilter?: RegExp
-    setup?: (build: EsbuildPluginBuild) => void | Promise<void>
+    setup?: (build: PluginBuild) => void | Promise<void>
     loader?: Loader | ((code: string, id: string) => Loader)
     config?: (options: BuildOptions) => void
   }

Original file line number	Diff line number	Diff line change
`@@ -71,7 +71,7 @@ export function getEsbuildPlugin<UserOptions = Record<string, never>>(`
`71`	`71`	`loader.options \|\|= _options`
`72`	`72`	`loader.onTransformCb = callback`
`73`	`73`	`},`
`74`		`- } as EsbuildPluginBuild)`
	`74`	`+ } as EsbuildPluginBuild, build)`
`75`	`75`
`76`	`76`	`// skip if no load & transform hooks`
`77`	`77`	`if (loader.onLoadCb \|\| loader.onTransformCb)`
`@@ -140,9 +140,9 @@ export function getEsbuildPlugin<UserOptions = Record<string, never>>(`
`140`	`140`	`}`
`141`	`141`
`142`	`142`	`function buildSetup(meta: UnpluginContextMeta & { framework: 'esbuild' }) {`
`143`		`- return (plugin: UnpluginOptions): EsbuildPlugin['setup'] => {`
`144`		`- return (_build) => {`
`145`		`- const build = meta.build = _build as EsbuildPluginBuild`
	`143`	`+ return (plugin: UnpluginOptions) => {`
	`144`	`+ return (build: EsbuildPluginBuild, rawBuild: PluginBuild) => {`
	`145`	`+ meta.build = build`
`146`	`146`	`const context = createBuildContext(build)`
`147`	`147`	`const { onStart, onEnd, onResolve, onLoad, onTransform, initialOptions } = build`
`148`	`148`
`@@ -306,7 +306,7 @@ function buildSetup(meta: UnpluginContextMeta & { framework: 'esbuild' }) {`
`306`	`306`	`}`
`307`	`307`
`308`	`308`	`if (plugin.esbuild?.setup)`
`309`		`- return plugin.esbuild.setup(meta.build)`
	`309`	`+ return plugin.esbuild.setup(rawBuild)`
`310`	`310`	`}`
`311`	`311`	`}`
`312`	`312`	`}`