fix: use "createSsrEnvironment" for the default ssr environment

vitejs · Mar 21, 2024 · 1e8dfc9 · 1e8dfc9
1 parent b679474
commit 1e8dfc9
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git 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
@@ -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
@@ -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,
       },