Skip to content

Commit 930cb31

Browse files
committedJan 8, 2025
fix(esbuild): get original esbuild context on getNativeBuildContext
1 parent b1369f2 commit 930cb31

File tree

3 files changed

+4
-6
lines changed

3 files changed

+4
-6
lines changed
 

Diff for: ‎src/esbuild/index.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,7 @@ export function getEsbuildPlugin<UserOptions = Record<string, never>>(
143143
function buildSetup() {
144144
return (plugin: UnpluginOptions) => {
145145
return (build: EsbuildPluginBuild, rawBuild: PluginBuild) => {
146-
const context = createBuildContext(build)
146+
const context = createBuildContext(rawBuild)
147147
const { onStart, onEnd, onResolve, onLoad, onTransform, initialOptions } = build
148148

149149
const onResolveFilter = plugin.esbuild?.onResolveFilter ?? /.*/

Diff for: ‎src/esbuild/utils.ts

+2-3
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
import type { DecodedSourceMap, EncodedSourceMap } from '@ampproject/remapping'
2-
import type { Loader, Location, Message, PartialMessage } from 'esbuild'
2+
import type { Loader, Location, Message, PartialMessage, PluginBuild } from 'esbuild'
33
import type { SourceMap } from 'rollup'
4-
import type { EsbuildPluginBuild } from '.'
54
import type { UnpluginBuildContext, UnpluginContext, UnpluginMessage } from '../types'
65
import { Buffer } from 'node:buffer'
76
import fs from 'node:fs'
@@ -110,7 +109,7 @@ export function combineSourcemaps(
110109
return map as EncodedSourceMap
111110
}
112111

113-
export function createBuildContext(build: EsbuildPluginBuild): UnpluginBuildContext {
112+
export function createBuildContext(build: PluginBuild): UnpluginBuildContext {
114113
const watchFiles: string[] = []
115114
const { initialOptions } = build
116115
return {

Diff for: ‎src/types.ts

+1-2
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ import type { AstNode, EmittedAsset, PluginContextMeta as RollupContextMeta, Plu
66
import type { Plugin as VitePlugin } from 'vite'
77
import type { Compilation as WebpackCompilation, Compiler as WebpackCompiler, LoaderContext as WebpackLoaderContext, WebpackPluginInstance } from 'webpack'
88
import type VirtualModulesPlugin from 'webpack-virtual-modules'
9-
import type { EsbuildPluginBuild } from './esbuild'
109

1110
export type {
1211
EsbuildPlugin,
@@ -48,7 +47,7 @@ export interface ExternalIdResult { id: string, external?: boolean }
4847

4948
export type NativeBuildContext =
5049
{ framework: 'webpack', compiler: WebpackCompiler, compilation?: WebpackCompilation, loaderContext?: WebpackLoaderContext<{ unpluginName: string }> } |
51-
{ framework: 'esbuild', build: EsbuildPluginBuild } |
50+
{ framework: 'esbuild', build: PluginBuild } |
5251
{ framework: 'rspack', compiler: RspackCompiler, compilation: RspackCompilation, loaderContext?: RspackLoaderContext } |
5352
{ framework: 'farm', context: FarmCompilationContext }
5453

0 commit comments

Comments
 (0)