refactor: move getDefaultResolvedEnvironmentOptions to `baseEnviron…

…ment.ts`
vitejs · Sep 30, 2024 · 30832ad · 30832ad
1 parent f25a8de
commit 30832ad
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 16 deletions.
diff --git a/packages/vite/src/node/baseEnvironment.ts b/packages/vite/src/node/baseEnvironment.ts
@@ -10,6 +10,19 @@ const environmentColors = [
   colors.gray,
 ]
 
+export function getDefaultResolvedEnvironmentOptions(
+  config: ResolvedConfig,
+): ResolvedEnvironmentOptions {
+  return {
+    define: config.define,
+    resolve: config.resolve,
+    consumer: 'server',
+    webCompatible: false,
+    dev: config.dev,
+    build: config.build,
+  }
+}
+
 export class PartialEnvironment {
   name: string
   getTopLevelConfig(): ResolvedConfig {

diff --git a/packages/vite/src/node/build.ts b/packages/vite/src/node/build.ts
@@ -67,10 +67,12 @@ import { completeSystemWrapPlugin } from './plugins/completeSystemWrap'
 import { mergeConfig } from './publicUtils'
 import { webWorkerPostPlugin } from './plugins/worker'
 import { getHookHandler } from './plugins'
-import { BaseEnvironment } from './baseEnvironment'
+import {
+  BaseEnvironment,
+  getDefaultResolvedEnvironmentOptions,
+} from './baseEnvironment'
 import type { MinimalPluginContext, Plugin, PluginContext } from './plugin'
 import type { RollupPluginHooks } from './typeUtils'
-import { getDefaultResolvedEnvironmentOptions } from './server/environment'
 
 export interface BuildEnvironmentOptions {
   /**

diff --git a/packages/vite/src/node/server/environment.ts b/packages/vite/src/node/server/environment.ts
@@ -1,7 +1,10 @@
 import type { FetchFunctionOptions, FetchResult } from 'vite/module-runner'
 import type { FSWatcher } from 'dep-types/chokidar'
 import colors from 'picocolors'
-import { BaseEnvironment } from '../baseEnvironment'
+import {
+  BaseEnvironment,
+  getDefaultResolvedEnvironmentOptions,
+} from '../baseEnvironment'
 import type {
   EnvironmentOptions,
   ResolvedConfig,
@@ -31,19 +34,6 @@ import {
 import type { RemoteEnvironmentTransport } from './environmentTransport'
 import { isWebSocketServer } from './ws'
 
-export function getDefaultResolvedEnvironmentOptions(
-  config: ResolvedConfig,
-): ResolvedEnvironmentOptions {
-  return {
-    define: config.define,
-    resolve: config.resolve,
-    consumer: 'server',
-    webCompatible: false,
-    dev: config.dev,
-    build: config.build,
-  }
-}
-
 export interface DevEnvironmentContext {
   hot: false | HotChannel
   options?: EnvironmentOptions