Skip to content

Commit d6d01c2

Browse files
authored
refactor: remove duplicate plugin context type (#19935)
1 parent 96f73d1 commit d6d01c2

File tree

5 files changed

+14
-26
lines changed

5 files changed

+14
-26
lines changed

packages/vite/rollup.dts.config.ts

-1
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,6 @@ const identifierReplacements: Record<string, Record<string, string>> = {
5050
Plugin$1: 'rollup.Plugin',
5151
PluginContext$1: 'rollup.PluginContext',
5252
MinimalPluginContext$1: 'rollup.MinimalPluginContext',
53-
TransformPluginContext$1: 'rollup.TransformPluginContext',
5453
TransformResult$1: 'rollup.TransformResult',
5554
},
5655
esbuild: {

packages/vite/src/node/build.ts

+3-1
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,10 @@ import type {
77
InternalModuleFormat,
88
LogLevel,
99
LogOrStringHandler,
10+
MinimalPluginContext,
1011
ModuleFormat,
1112
OutputOptions,
13+
PluginContext,
1214
RollupBuild,
1315
RollupError,
1416
RollupLog,
@@ -75,7 +77,7 @@ import {
7577
BaseEnvironment,
7678
getDefaultResolvedEnvironmentOptions,
7779
} from './baseEnvironment'
78-
import type { MinimalPluginContext, Plugin, PluginContext } from './plugin'
80+
import type { Plugin } from './plugin'
7981
import type { RollupPluginHooks } from './typeUtils'
8082
import {
8183
createFilterForTransform,

packages/vite/src/node/environment.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1+
import type { PluginContext } from 'rollup'
12
import type { DevEnvironment } from './server/environment'
23
import type { BuildEnvironment } from './build'
34
import type { ScanEnvironment } from './optimizer/scan'
45
import type { UnknownEnvironment } from './baseEnvironment'
5-
import type { PluginContext } from './plugin'
66

77
export type Environment =
88
| DevEnvironment

packages/vite/src/node/plugin.ts

+4-21
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,10 @@ import type {
22
CustomPluginOptions,
33
LoadResult,
44
ObjectHook,
5+
PluginContext,
56
ResolveIdResult,
6-
MinimalPluginContext as RollupMinimalPluginContext,
77
Plugin as RollupPlugin,
8-
PluginContext as RollupPluginContext,
9-
TransformPluginContext as RollupTransformPluginContext,
8+
TransformPluginContext,
109
TransformResult,
1110
} from 'rollup'
1211
import type {
@@ -65,23 +64,7 @@ export interface HotUpdatePluginContext {
6564
environment: DevEnvironment
6665
}
6766

68-
export interface MinimalPluginContext
69-
extends RollupMinimalPluginContext,
70-
PluginContextExtension {}
71-
72-
export interface PluginContext
73-
extends RollupPluginContext,
74-
PluginContextExtension {}
75-
76-
export interface ResolveIdPluginContext
77-
extends RollupPluginContext,
78-
PluginContextExtension {}
79-
80-
export interface TransformPluginContext
81-
extends RollupTransformPluginContext,
82-
PluginContextExtension {}
83-
84-
// Argument Rollup types to have the PluginContextExtension
67+
// Augment Rollup types to have the PluginContextExtension
8568
declare module 'rollup' {
8669
export interface MinimalPluginContext extends PluginContextExtension {}
8770
}
@@ -127,7 +110,7 @@ export interface Plugin<A = any> extends RollupPlugin<A> {
127110
*/
128111
resolveId?: ObjectHook<
129112
(
130-
this: ResolveIdPluginContext,
113+
this: PluginContext,
131114
source: string,
132115
importer: string | undefined,
133116
options: {

packages/vite/src/node/plugins/asset.ts

+6-2
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,18 @@ import path from 'node:path'
22
import fsp from 'node:fs/promises'
33
import { Buffer } from 'node:buffer'
44
import * as mrmime from 'mrmime'
5-
import type { NormalizedOutputOptions, RenderedChunk } from 'rollup'
5+
import type {
6+
NormalizedOutputOptions,
7+
PluginContext,
8+
RenderedChunk,
9+
} from 'rollup'
610
import MagicString from 'magic-string'
711
import colors from 'picocolors'
812
import {
913
createToImportMetaURLBasedRelativeRuntime,
1014
toOutputFilePathInJS,
1115
} from '../build'
12-
import type { Plugin, PluginContext } from '../plugin'
16+
import type { Plugin } from '../plugin'
1317
import type { ResolvedConfig } from '../config'
1418
import { checkPublicFile } from '../publicDir'
1519
import {

0 commit comments

Comments
 (0)