From 1e8dfc91440efb942ec44e826e9f418f73deb1fc Mon Sep 17 00:00:00 2001
From: Vladimir Sheremet <sleuths.slews0s@icloud.com>
Date: Thu, 21 Mar 2024 11:28:16 +0100
Subject: [PATCH] fix: use "createSsrEnvironment" for the default ssr
 environment

---
 packages/vite/src/node/server/environments/ssrEnvironment.ts | 5 ++---
 packages/vite/src/node/server/index.ts                       | 3 ++-
 packages/vite/src/node/ssr/runtime/__tests__/utils.ts        | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/packages/vite/src/node/server/environments/ssrEnvironment.ts b/packages/vite/src/node/server/environments/ssrEnvironment.ts
index 0eaf8f13bfb057..3752fe54a7f651 100644
--- a/packages/vite/src/node/server/environments/ssrEnvironment.ts
+++ b/packages/vite/src/node/server/environments/ssrEnvironment.ts
@@ -4,11 +4,11 @@ import type { ViteDevServer } from '../index'
 import { asyncFunctionDeclarationPaddingLineCount } from '../../../shared/utils'
 
 export function createSsrEnvironment(
-  hotChannel: ServerHMRChannel,
   server: ViteDevServer,
   name: string,
+  hotChannel: ServerHMRChannel,
 ): DevEnvironment {
-  const environment = new DevEnvironment(server, name, {
+  return new DevEnvironment(server, name, {
     hot: hotChannel,
     runner: {
       processSourceMap(map) {
@@ -20,5 +20,4 @@ export function createSsrEnvironment(
       },
     },
   })
-  return environment
 }
diff --git a/packages/vite/src/node/server/index.ts b/packages/vite/src/node/server/index.ts
index 4e109b29fa7bb2..e1d9172d4d78d4 100644
--- a/packages/vite/src/node/server/index.ts
+++ b/packages/vite/src/node/server/index.ts
@@ -92,6 +92,7 @@ import { transformRequest } from './transformRequest'
 import { searchForWorkspaceRoot } from './searchRoot'
 import { warmupFiles } from './warmup'
 import { DevEnvironment } from './environment'
+import { createSsrEnvironment } from './environments/ssrEnvironment'
 
 export interface ServerOptions extends CommonServerOptions {
   /**
@@ -804,7 +805,7 @@ export async function _createServer(
     getResolvedEnvironmentConfig(config, 'ssr')?.dev?.createEnvironment ??
     server.config.dev?.createEnvironment ??
     ((server: ViteDevServer, name: string) =>
-      new DevEnvironment(server, name, { hot: ssrHotChannel }))
+      createSsrEnvironment(server, name, ssrHotChannel))
 
   server.ssrEnvironment = createNodeEnvironment(server, 'ssr')
   environments.push(server.ssrEnvironment)
diff --git a/packages/vite/src/node/ssr/runtime/__tests__/utils.ts b/packages/vite/src/node/ssr/runtime/__tests__/utils.ts
index 504f10b8867f8a..70cc20b1f88cc1 100644
--- a/packages/vite/src/node/ssr/runtime/__tests__/utils.ts
+++ b/packages/vite/src/node/ssr/runtime/__tests__/utils.ts
@@ -73,7 +73,7 @@ export async function createModuleRunnerTester(
       ],
       ...config,
     })
-    t.runner = await createServerModuleRunner(t.server, {
+    t.runner = await createServerModuleRunner(t.server.ssrEnvironment, {
       hmr: {
         logger: false,
       },