refactor: remove server from createServerModuleRunner

Author: sheremet-va

packages/vite/src/node/ssr/runtime/__tests__/utils.ts

@@ -76,7 +76,7 @@ export async function createModuleRunnerTester(
       ...config,
     })
     t.environment = t.server.environments.ssr
-    t.runner = await createServerModuleRunner(t.server, t.environment, {
+    t.runner = await createServerModuleRunner(t.environment, {
       hmr: {
         logger: false,
       },

packages/vite/src/node/ssr/runtime/serverHmrConnector.ts

@@ -1,6 +1,5 @@
 import type { CustomPayload, HMRPayload } from 'types/hmrPayload'
 import type { ModuleRunnerHMRConnection } from 'vite/module-runner'
-import type { ViteDevServer } from '../../server'
 import type { HMRBroadcasterClient, ServerHMRChannel } from '../../server/hmr'
 
 class ServerHMRBroadcasterClient implements HMRBroadcasterClient {
@@ -32,20 +31,11 @@ class ServerHMRBroadcasterClient implements HMRBroadcasterClient {
  */
 export class ServerHMRConnector implements ModuleRunnerHMRConnection {
   private handlers: ((payload: HMRPayload) => void)[] = []
-  private hmrChannel: ServerHMRChannel
   private hmrClient: ServerHMRBroadcasterClient
 
   private connected = false
 
-  constructor(server: ViteDevServer) {
-    const hmrChannel = server.hot?.channels.find(
-      (c) => c.name === 'ssr',
-    ) as ServerHMRChannel
-    if (!hmrChannel) {
-      throw new Error(
-        "Your version of Vite doesn't support HMR during SSR. Please, use Vite 5.1 or higher.",
-      )
-    }
+  constructor(private hmrChannel: ServerHMRChannel) {
     this.hmrClient = new ServerHMRBroadcasterClient(hmrChannel)
     hmrChannel.api.outsideEmitter.on('send', (payload: HMRPayload) => {
       this.handlers.forEach((listener) => listener(payload))

packages/vite/src/node/ssr/runtime/serverModuleRunner.ts

@@ -6,8 +6,8 @@ import type {
   ModuleRunnerHmr,
   ModuleRunnerOptions,
 } from 'vite/module-runner'
-import type { ViteDevServer } from '../../server'
 import type { DevEnvironment } from '../../server/environment'
+import type { ServerHMRChannel } from '../../server/hmr'
 import { ServerHMRConnector } from './serverHmrConnector'
 
 /**
@@ -34,10 +34,10 @@ export interface ServerModuleRunnerOptions
 }
 
 function createHMROptions(
-  server: ViteDevServer,
+  environment: DevEnvironment,
   options: ServerModuleRunnerOptions,
 ) {
-  if (server.config.server.hmr === false || options.hmr === false) {
+  if (environment.config.server.hmr === false || options.hmr === false) {
     return false
   }
   if (options.hmr?.connection) {
@@ -46,7 +46,8 @@ function createHMROptions(
       logger: options.hmr.logger,
     }
   }
-  const connection = new ServerHMRConnector(server)
+  if (!('api' in environment.hot)) return false
+  const connection = new ServerHMRConnector(environment.hot as ServerHMRChannel)
   return {
     connection,
     logger: options.hmr?.logger,
@@ -82,11 +83,10 @@ function resolveSourceMapOptions(options: ServerModuleRunnerOptions) {
  * @experimental
  */
 export function createServerModuleRunner(
-  server: ViteDevServer,
   environment: DevEnvironment,
   options: ServerModuleRunnerOptions = {},
 ): ModuleRunner {
-  const hmr = createHMROptions(server, options)
+  const hmr = createHMROptions(environment, options)
   return new ModuleRunner(
     {
       ...options,

packages/vite/src/node/ssr/ssrModuleLoader.ts

@@ -21,7 +21,6 @@ export async function ssrLoadModule(
   const runner =
     server._ssrCompatModuleRunner ||
     (server._ssrCompatModuleRunner = createServerModuleRunner(
-      server,
       server.environments.ssr,
       {
         sourcemapInterceptor: false,

playground/environment-react-ssr/vite.config.ts

@@ -66,7 +66,7 @@ export function vitePluginSsrMiddleware({
     name: vitePluginSsrMiddleware.name,
 
     configureServer(server) {
-      const runner = createServerModuleRunner(server, server.environments.ssr)
+      const runner = createServerModuleRunner(server.environments.ssr)
       const handler: Connect.NextHandleFunction = async (req, res, next) => {
         try {
           const mod = await runner.import(entry)

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

@@ -1140,7 +1140,7 @@ async function setupModuleRunner(
   // @ts-expect-error not typed for HMR
   globalThis.log = (...msg) => logger.log(...msg)
 
-  runner = createServerModuleRunner(server, server.environments.ssr, {
+  runner = createServerModuleRunner(server.environments.ssr, {
     hmr: {
       logger,
     },

playground/ssr-html/test-network-imports.js

@@ -12,13 +12,9 @@ async function runTest(userRunner) {
   })
   let mod
   if (userRunner) {
-    const runner = await createServerModuleRunner(
-      server,
-      server.environments.ssr,
-      {
-        hmr: false,
-      },
-    )
+    const runner = await createServerModuleRunner(server.environments.ssr, {
+      hmr: false,
+    })
     mod = await runner.import('/src/network-imports.js')
   } else {
     mod = await server.ssrLoadModule('/src/network-imports.js')

playground/ssr-html/test-stacktrace-runtime.js

@@ -13,7 +13,7 @@ const server = await createServer({
   },
 })
 
-const runner = await createServerModuleRunner(server, server.environments.ssr, {
+const runner = await createServerModuleRunner(server.environments.ssr, {
   sourcemapInterceptor: 'prepareStackTrace',
 })