Skip to content

Commit

Permalink
fix(esbuild): pass original build for custom esbuild setup
Browse files Browse the repository at this point in the history
backport 4abab22
  • Loading branch information
sxzz committed Jan 8, 2025
1 parent 569ea99 commit 24a7188
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 7 deletions.
10 changes: 5 additions & 5 deletions src/esbuild/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -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

Expand Down Expand Up @@ -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)
}
}
}
4 changes: 2 additions & 2 deletions src/types.ts
Original file line number Diff line number Diff line change
@@ -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'
Expand Down Expand Up @@ -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
}
Expand Down

0 comments on commit 24a7188

Please sign in to comment.