feat: support this.environment in options and onLog hook (#18142)

vitejs · Sep 19, 2024 · 7722c06 · 7722c06
1 parent b529b6f
commit 7722c06
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 5 deletions.
diff --git a/packages/vite/src/node/build.ts b/packages/vite/src/node/build.ts
@@ -68,7 +68,7 @@ import { mergeConfig } from './publicUtils'
 import { webWorkerPostPlugin } from './plugins/worker'
 import { getHookHandler } from './plugins'
 import { BaseEnvironment } from './baseEnvironment'
-import type { Plugin, PluginContext } from './plugin'
+import type { MinimalPluginContext, Plugin, PluginContext } from './plugin'
 import type { RollupPluginHooks } from './typeUtils'
 
 export interface BuildEnvironmentOptions {
@@ -1253,7 +1253,7 @@ function wrapEnvironmentHook<HookName extends keyof Plugin>(
   }
 }
 
-function injectEnvironmentInContext<Context extends PluginContext>(
+function injectEnvironmentInContext<Context extends MinimalPluginContext>(
   context: Context,
   environment: BuildEnvironment,
 ) {

diff --git a/packages/vite/src/node/constants.ts b/packages/vite/src/node/constants.ts
@@ -8,6 +8,7 @@ const { version } = JSON.parse(
 )
 
 export const ROLLUP_HOOKS = [
+  'options',
   'buildStart',
   'buildEnd',
   'renderStart',
@@ -33,6 +34,7 @@ export const ROLLUP_HOOKS = [
   'resolveId',
   'shouldTransformCachedModule',
   'transform',
+  'onLog',
 ] satisfies RollupPluginHooks[]
 
 export const VERSION = version as string

diff --git a/packages/vite/src/node/plugin.ts b/packages/vite/src/node/plugin.ts
@@ -3,6 +3,7 @@ import type {
   LoadResult,
   ObjectHook,
   ResolveIdResult,
+  MinimalPluginContext as RollupMinimalPluginContext,
   Plugin as RollupPlugin,
   PluginContext as RollupPluginContext,
   TransformPluginContext as RollupTransformPluginContext,
@@ -61,6 +62,10 @@ export interface HotUpdatePluginContext {
   environment: DevEnvironment
 }
 
+export interface MinimalPluginContext
+  extends RollupMinimalPluginContext,
+    PluginContextExtension {}
+
 export interface PluginContext
   extends RollupPluginContext,
     PluginContextExtension {}
@@ -75,7 +80,7 @@ export interface TransformPluginContext
 
 // Argument Rollup types to have the PluginContextExtension
 declare module 'rollup' {
-  export interface PluginContext extends PluginContextExtension {}
+  export interface MinimalPluginContext extends PluginContextExtension {}
 }
 
 /**

diff --git a/packages/vite/src/node/server/pluginContainer.ts b/packages/vite/src/node/server/pluginContainer.ts
@@ -185,6 +185,7 @@ class EnvironmentPluginContainer {
       warn: noop,
       // @ts-expect-error noop
       error: noop,
+      environment,
     }
     const utils = createPluginHookUtils(plugins)
     this.getSortedPlugins = utils.getSortedPlugins

diff --git a/packages/vite/src/node/typeUtils.ts b/packages/vite/src/node/typeUtils.ts
@@ -1,7 +1,7 @@
 import type {
   ObjectHook,
+  MinimalPluginContext as RollupMinimalPluginContext,
   Plugin as RollupPlugin,
-  PluginContext as RollupPluginContext,
 } from 'rollup'
 
 export type NonNeverKeys<T> = {
@@ -11,7 +11,7 @@ export type NonNeverKeys<T> = {
 export type GetHookContextMap<Plugin> = {
   [K in keyof Plugin]-?: Plugin[K] extends ObjectHook<infer T, unknown>
     ? T extends (this: infer This, ...args: any[]) => any
-      ? This extends RollupPluginContext
+      ? This extends RollupMinimalPluginContext
         ? This
         : never
       : never