refactor: use pluginContainer.minimalContext

Author: sapphi-red

packages/vite/src/node/server/environment.ts

@@ -57,7 +57,7 @@ export class DevEnvironment extends BaseEnvironment {
    */
   _remoteRunnerOptions: DevEnvironmentContext['remoteRunner']
 
-  get pluginContainer(): EnvironmentPluginContainer {
+  get pluginContainer(): EnvironmentPluginContainer<DevEnvironment> {
     if (!this._pluginContainer)
       throw new Error(
         `${this.name} environment.pluginContainer called before initialized`,
@@ -67,7 +67,7 @@ export class DevEnvironment extends BaseEnvironment {
   /**
    * @internal
    */
-  _pluginContainer: EnvironmentPluginContainer | undefined
+  _pluginContainer: EnvironmentPluginContainer<DevEnvironment> | undefined
 
   /**
    * @internal

packages/vite/src/node/server/hmr.ts

@@ -27,10 +27,7 @@ import type { EnvironmentModuleNode } from './moduleGraph'
 import type { ModuleNode } from './mixedModuleGraph'
 import type { DevEnvironment } from './environment'
 import { prepareError } from './middlewares/error'
-import {
-  BasicMinimalPluginContext,
-  MinimalPluginContext,
-} from './pluginContainer'
+import { BasicMinimalPluginContext } from './pluginContainer'
 import type { HttpServer } from '.'
 import { restartServerWithUrls } from '.'
 
@@ -473,13 +470,7 @@ export async function handleHMRUpdate(
   )
   const clientEnvironment = server.environments.client
   const ssrEnvironment = server.environments.ssr
-  const clientContext = new MinimalPluginContext(
-    {
-      rollupVersion,
-      watchMode: true,
-    },
-    clientEnvironment,
-  )
+  const clientContext = clientEnvironment.pluginContainer.minimalContext
   const clientHotUpdateOptions = hotMap.get(clientEnvironment)!.options
   const ssrHotUpdateOptions = hotMap.get(ssrEnvironment)?.options
   try {
@@ -570,13 +561,7 @@ export async function handleHMRUpdate(
   for (const environment of Object.values(server.environments)) {
     if (environment.name === 'client') continue
     const hot = hotMap.get(environment)!
-    const context = new MinimalPluginContext(
-      {
-        rollupVersion,
-        watchMode: true,
-      },
-      environment,
-    )
+    const context = environment.pluginContainer.minimalContext
     try {
       for (const plugin of getSortedHotUpdatePlugins(environment)) {
         if (plugin.hotUpdate) {

packages/vite/src/node/server/pluginContainer.ts

@@ -137,12 +137,14 @@ export interface PluginContainerOptions {
  * instead of using environment.plugins to allow the creation of different
  * pipelines working with the same environment (used for createIdResolver).
  */
-export async function createEnvironmentPluginContainer(
-  environment: Environment,
+export async function createEnvironmentPluginContainer<
+  Env extends Environment = Environment,
+>(
+  environment: Env,
   plugins: Plugin[],
   watcher?: FSWatcher,
   autoStart = true,
-): Promise<EnvironmentPluginContainer> {
+): Promise<EnvironmentPluginContainer<Env>> {
   const container = new EnvironmentPluginContainer(
     environment,
     plugins,
@@ -160,7 +162,7 @@ export type SkipInformation = {
   called?: boolean
 }
 
-class EnvironmentPluginContainer {
+class EnvironmentPluginContainer<Env extends Environment = Environment> {
   private _pluginContextMap = new Map<Plugin, PluginContext>()
   private _resolvedRollupOptions?: InputOptions
   private _processesing = new Set<Promise<any>>()
@@ -177,7 +179,7 @@ class EnvironmentPluginContainer {
 
   moduleGraph: EnvironmentModuleGraph | undefined
   watchFiles = new Set<string>()
-  minimalContext: MinimalPluginContext
+  minimalContext: MinimalPluginContext<Env>
 
   private _started = false
   private _buildStartPromise: Promise<void> | undefined
@@ -187,7 +189,7 @@ class EnvironmentPluginContainer {
    * @internal use `createEnvironmentPluginContainer` instead
    */
   constructor(
-    public environment: Environment,
+    public environment: Env,
     public plugins: Plugin[],
     public watcher?: FSWatcher,
     autoStart = true,
@@ -599,7 +601,7 @@ export class BasicMinimalPluginContext<Meta = PluginContextMeta> {
   }
 }
 
-export class MinimalPluginContext<T extends Environment = Environment>
+class MinimalPluginContext<T extends Environment = Environment>
   extends BasicMinimalPluginContext
   implements RollupMinimalPluginContext
 {