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

sxzz · sxzz · commit 9f85a2603851 · 2024-12-30T09:22:06.000+08:00
diff --git a/src/esbuild/index.ts b/src/esbuild/index.ts
@@ -142,8 +142,8 @@ export function getEsbuildPlugin<UserOptions = Record<string, never>>(
 
 function buildSetup() {
   return (plugin: UnpluginOptions): EsbuildPlugin['setup'] => {
-    return (_build) => {
-      const build = _build as EsbuildPluginBuild
+    return (rawBuild) => {
+      const build = rawBuild as EsbuildPluginBuild
       const context = createBuildContext(build)
       const { onStart, onEnd, onResolve, onLoad, onTransform, initialOptions } = build
 
@@ -305,7 +305,7 @@ function buildSetup() {
       }
 
       if (plugin.esbuild?.setup)
-        return plugin.esbuild.setup(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'
@@ -97,7 +97,7 @@ export interface UnpluginOptions {
     onResolveFilter?: RegExp
     onLoadFilter?: RegExp
     loader?: Loader | ((code: string, id: string) => Loader)
-    setup?: (build: EsbuildPluginBuild) => void | Promise<void>
+    setup?: (build: PluginBuild) => void | Promise<void>
     config?: (options: BuildOptions) => void
   }
   farm?: Partial<FarmPlugin>

Original file line number	Diff line number	Diff line change
`@@ -142,8 +142,8 @@ export function getEsbuildPlugin<UserOptions = Record<string, never>>(`
`142`	`142`
`143`	`143`	`function buildSetup() {`
`144`	`144`	`return (plugin: UnpluginOptions): EsbuildPlugin['setup'] => {`
`145`		`- return (_build) => {`
`146`		`- const build = _build as EsbuildPluginBuild`
	`145`	`+ return (rawBuild) => {`
	`146`	`+ const build = rawBuild as EsbuildPluginBuild`
`147`	`147`	`const context = createBuildContext(build)`
`148`	`148`	`const { onStart, onEnd, onResolve, onLoad, onTransform, initialOptions } = build`
`149`	`149`
`@@ -305,7 +305,7 @@ function buildSetup() {`
`305`	`305`	`}`
`306`	`306`
`307`	`307`	`if (plugin.esbuild?.setup)`
`308`		`- return plugin.esbuild.setup(build)`
	`308`	`+ return plugin.esbuild.setup(rawBuild)`
`309`	`309`	`}`
`310`	`310`	`}`
`311`	`311`	`}`