fix: make it easier to configure environment runner (#18273)

Author: sheremet-va

packages/vite/src/node/server/environments/runnableEnvironment.ts

@@ -2,6 +2,7 @@ import type { ModuleRunner } from 'vite/module-runner'
 import type { ResolvedConfig } from '../../config'
 import type { DevEnvironmentContext } from '../environment'
 import { DevEnvironment } from '../environment'
+import type { ServerModuleRunnerOptions } from '../../ssr/runtime/serverModuleRunner'
 import { createServerModuleRunner } from '../../ssr/runtime/serverModuleRunner'
 import type { HotChannel } from '../hmr'
 import { createServerHotChannel } from '../hmr'
@@ -21,7 +22,11 @@ export function createRunnableDevEnvironment(
 
 export interface RunnableDevEnvironmentContext
   extends Omit<DevEnvironmentContext, 'hot'> {
-  runner?: (environment: RunnableDevEnvironment) => ModuleRunner
+  runner?: (
+    environment: RunnableDevEnvironment,
+    options?: ServerModuleRunnerOptions,
+  ) => ModuleRunner
+  runnerOptions?: ServerModuleRunnerOptions
   hot?: false | HotChannel
 }
 
@@ -34,8 +39,12 @@ export function isRunnableDevEnvironment(
 class RunnableDevEnvironment extends DevEnvironment {
   private _runner: ModuleRunner | undefined
   private _runnerFactory:
-    | ((environment: RunnableDevEnvironment) => ModuleRunner)
+    | ((
+        environment: RunnableDevEnvironment,
+        options?: ServerModuleRunnerOptions,
+      ) => ModuleRunner)
     | undefined
+  private _runnerOptions: ServerModuleRunnerOptions | undefined
 
   constructor(
     name: string,
@@ -44,17 +53,15 @@ class RunnableDevEnvironment extends DevEnvironment {
   ) {
     super(name, config, context as DevEnvironmentContext)
     this._runnerFactory = context.runner
+    this._runnerOptions = context.runnerOptions
   }
 
   get runner(): ModuleRunner {
     if (this._runner) {
       return this._runner
     }
-    if (this._runnerFactory) {
-      this._runner = this._runnerFactory(this)
-      return this._runner
-    }
-    this._runner = createServerModuleRunner(this)
+    const factory = this._runnerFactory || createServerModuleRunner
+    this._runner = factory(this, this._runnerOptions)
     return this._runner
   }
 }

playground/hmr-ssr/__tests__/hmr-ssr.spec.ts

@@ -15,7 +15,6 @@ import {
   createRunnableDevEnvironment,
   createServer,
   createServerHotChannel,
-  createServerModuleRunner,
 } from 'vite'
 import type { ModuleRunner } from 'vite/module-runner'
 import {
@@ -1067,8 +1066,7 @@ async function setupModuleRunner(
         dev: {
           createEnvironment(name, config) {
             return createRunnableDevEnvironment(name, config, {
-              runner: (env) =>
-                createServerModuleRunner(env, { hmr: { logger } }),
+              runnerOptions: { hmr: { logger } },
               hot: createServerHotChannel(),
             })
           },