fix(esbuild): get original esbuild context on getNativeBuildContext

sxzz · sxzz · commit 930cb317845a · 2025-01-08T13:10:22.000+08:00
diff --git a/src/esbuild/index.ts b/src/esbuild/index.ts
@@ -143,7 +143,7 @@ export function getEsbuildPlugin<UserOptions = Record<string, never>>(
 function buildSetup() {
   return (plugin: UnpluginOptions) => {
     return (build: EsbuildPluginBuild, rawBuild: PluginBuild) => {
-      const context = createBuildContext(build)
+      const context = createBuildContext(rawBuild)
       const { onStart, onEnd, onResolve, onLoad, onTransform, initialOptions } = build
 
       const onResolveFilter = plugin.esbuild?.onResolveFilter ?? /.*/
diff --git a/src/esbuild/utils.ts b/src/esbuild/utils.ts
@@ -1,7 +1,6 @@
 import type { DecodedSourceMap, EncodedSourceMap } from '@ampproject/remapping'
-import type { Loader, Location, Message, PartialMessage } from 'esbuild'
+import type { Loader, Location, Message, PartialMessage, PluginBuild } from 'esbuild'
 import type { SourceMap } from 'rollup'
-import type { EsbuildPluginBuild } from '.'
 import type { UnpluginBuildContext, UnpluginContext, UnpluginMessage } from '../types'
 import { Buffer } from 'node:buffer'
 import fs from 'node:fs'
@@ -110,7 +109,7 @@ export function combineSourcemaps(
   return map as EncodedSourceMap
 }
 
-export function createBuildContext(build: EsbuildPluginBuild): UnpluginBuildContext {
+export function createBuildContext(build: PluginBuild): UnpluginBuildContext {
   const watchFiles: string[] = []
   const { initialOptions } = build
   return {
diff --git a/src/types.ts b/src/types.ts
@@ -6,7 +6,6 @@ import type { AstNode, EmittedAsset, PluginContextMeta as RollupContextMeta, Plu
 import type { Plugin as VitePlugin } from 'vite'
 import type { Compilation as WebpackCompilation, Compiler as WebpackCompiler, LoaderContext as WebpackLoaderContext, WebpackPluginInstance } from 'webpack'
 import type VirtualModulesPlugin from 'webpack-virtual-modules'
-import type { EsbuildPluginBuild } from './esbuild'
 
 export type {
   EsbuildPlugin,
@@ -48,7 +47,7 @@ export interface ExternalIdResult { id: string, external?: boolean }
 
 export type NativeBuildContext =
   { framework: 'webpack', compiler: WebpackCompiler, compilation?: WebpackCompilation, loaderContext?: WebpackLoaderContext<{ unpluginName: string }> } |
-  { framework: 'esbuild', build: EsbuildPluginBuild } |
+  { framework: 'esbuild', build: PluginBuild } |
   { framework: 'rspack', compiler: RspackCompiler, compilation: RspackCompilation, loaderContext?: RspackLoaderContext } |
   { framework: 'farm', context: FarmCompilationContext }
 
