feat: add removeServerPluginContainer future deprecation (#20437)

Author: sapphi-red

docs/changes/per-environment-apis.md

@@ -14,6 +14,7 @@ The `Environment` instance was first introduced at `v6.0`. The deprecation of `s
 ```ts
 future: {
   removeServerModuleGraph: 'warn',
+  removeServerPluginContainer: 'warn',
   removeServerTransformRequest: 'warn',
   removeServerWarmupRequest: 'warn',
 }
@@ -30,5 +31,6 @@ In Vite v6, it is now possible to create any number of custom environments (`cli
 ## Migration Guide
 
 - `server.moduleGraph` -> [`environment.moduleGraph`](/guide/api-environment-instances#separate-module-graphs)
+- `server.pluginContainer` -> `environment.pluginContainer`
 - `server.transformRequest(url, ssr)` -> `environment.transformRequest(url)`
 - `server.warmupRequest(url, ssr)` -> `environment.warmupRequest(url)`

packages/vite/src/node/config.ts

@@ -483,6 +483,7 @@ export interface FutureOptions {
   removePluginHookSsrArgument?: 'warn'
 
   removeServerModuleGraph?: 'warn'
+  removeServerPluginContainer?: 'warn'
   removeServerHot?: 'warn'
   removeServerTransformRequest?: 'warn'
   removeServerWarmupRequest?: 'warn'

packages/vite/src/node/deprecations.ts

@@ -8,6 +8,7 @@ const deprecationCode = {
   removePluginHookHandleHotUpdate: 'changes/hotupdate-hook',
 
   removeServerModuleGraph: 'changes/per-environment-apis',
+  removeServerPluginContainer: 'changes/per-environment-apis',
   removeServerHot: 'changes/per-environment-apis',
   removeServerTransformRequest: 'changes/per-environment-apis',
   removeServerWarmupRequest: 'changes/per-environment-apis',
@@ -23,6 +24,8 @@ const deprecationMessages = {
 
   removeServerModuleGraph:
     'The `server.moduleGraph` is replaced with `this.environment.moduleGraph`.',
+  removeServerPluginContainer:
+    'The `server.pluginContainer` is replaced with `this.environment.pluginContainer`.',
   removeServerHot: 'The `server.hot` is replaced with `this.environment.hot`.',
   removeServerTransformRequest:
     'The `server.transformRequest` is replaced with `this.environment.transformRequest`.',

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

@@ -531,7 +531,7 @@ export async function _createServer(
     client: () => environments.client.moduleGraph,
     ssr: () => environments.ssr.moduleGraph,
   })
-  const pluginContainer = createPluginContainer(environments)
+  let pluginContainer = createPluginContainer(environments)
 
   const closeHttpServer = createServerCloseFn(httpServer)
 
@@ -568,7 +568,13 @@ export async function _createServer(
     hot: ws,
 
     environments,
-    pluginContainer,
+    get pluginContainer() {
+      warnFutureDeprecation(config, 'removeServerPluginContainer')
+      return pluginContainer
+    },
+    set pluginContainer(p) {
+      pluginContainer = p
+    },
     get moduleGraph() {
       warnFutureDeprecation(config, 'removeServerModuleGraph')
       return moduleGraph

packages/vite/src/node/server/middlewares/indexHtml.ts

@@ -383,9 +383,11 @@ const devHtmlHook: IndexHtmlTransformHook = async (
         )
       ensureWatchedFile(watcher, mod.file, config.root)
 
-      const result = await server!.pluginContainer.transform(code, mod.id!, {
-        environment: server!.environments.client,
-      })
+      const result =
+        await server!.environments.client.pluginContainer.transform(
+          code,
+          mod.id!,
+        )
       let content = ''
       if (result.map && 'version' in result.map) {
         if (result.map.mappings) {
@@ -408,9 +410,7 @@ const devHtmlHook: IndexHtmlTransformHook = async (
         )
       ensureWatchedFile(watcher, mod.file, config.root)
 
-      await server?.pluginContainer.transform(code, mod.id!, {
-        environment: server!.environments.client,
-      })
+      await server?.environments.client.pluginContainer.transform(code, mod.id!)
 
       const hash = getHash(cleanUrl(mod.id!))
       const result = htmlProxyResult.get(`${hash}_${index}`)

packages/vite/src/node/ssr/__tests__/ssrLoadModule.spec.ts

@@ -17,7 +17,7 @@ async function createDevServer() {
       noDiscovery: true,
     },
   })
-  server.pluginContainer.buildStart({})
+  server.environments.ssr.pluginContainer.buildStart({})
   return server
 }
 
@@ -93,7 +93,7 @@ test('virtual module invalidation simple', async () => {
       },
     ],
   })
-  await server.pluginContainer.buildStart({})
+  server.environments.ssr.pluginContainer.buildStart({})
 
   const mod1 = await server.ssrLoadModule('virtual:test')
   expect(mod1.default).toEqual(1)
@@ -151,7 +151,7 @@ test('virtual module invalidation nested', async () => {
       },
     ],
   })
-  await server.pluginContainer.buildStart({})
+  server.environments.ssr.pluginContainer.buildStart({})
 
   const mod1 = await server.ssrLoadModule('virtual:test')
   expect(mod1.default).toEqual(1)

packages/vite/src/node/ssr/__tests__/ssrStacktrace.spec.ts

@@ -13,7 +13,7 @@ async function createDevServer() {
       noDiscovery: true,
     },
   })
-  server.pluginContainer.buildStart({})
+  server.environments.ssr.pluginContainer.buildStart({})
   return server
 }