refactor: isolate back compat module graph in its own module

vitejs · Mar 22, 2024 · 8000e8e · 8000e8e
1 parent a7a06fe
commit 8000e8e
Show file tree

Hide file tree

Showing 8 changed files with 654 additions and 634 deletions.
diff --git a/packages/vite/src/node/index.ts b/packages/vite/src/node/index.ts
@@ -114,8 +114,6 @@ export type {
 } from './server/ws'
 export type { PluginContainer } from './server/pluginContainer'
 export type {
-  ModuleGraph,
-  ModuleNode,
   EnvironmentModuleGraph,
   EnvironmentModuleNode,
   ResolvedUrl,
@@ -186,3 +184,6 @@ export type { RollupCommonJSOptions } from 'dep-types/commonjs'
 export type { RollupDynamicImportVarsOptions } from 'dep-types/dynamicImportVars'
 export type { Matcher, AnymatchPattern, AnymatchFn } from 'dep-types/anymatch'
 export type { LightningCSSOptions } from 'dep-types/lightningcss'
+
+// Backward compatibility
+export type { ModuleGraph, ModuleNode } from './server/mixedModuleGraph'
diff --git a/packages/vite/src/node/plugin.ts b/packages/vite/src/node/plugin.ts
@@ -12,7 +12,8 @@ export type { PluginContext } from 'rollup'
 import type { ConfigEnv, ResolvedConfig, UserConfig } from './config'
 import type { ServerHook, ViteDevServer } from './server'
 import type { IndexHtmlTransform } from './plugins/html'
-import type { EnvironmentModuleNode, ModuleNode } from './server/moduleGraph'
+import type { EnvironmentModuleNode } from './server/moduleGraph'
+import type { ModuleNode } from './server/mixedModuleGraph'
 import type { HmrContext, HotUpdateContext } from './server/hmr'
 import type { PreviewServerHook } from './preview'
 import type { DevEnvironment } from './server/environment'

diff --git a/packages/vite/src/node/server/__tests__/moduleGraph.spec.ts b/packages/vite/src/node/server/__tests__/moduleGraph.spec.ts
@@ -1,6 +1,7 @@
 import { describe, expect, it } from 'vitest'
-import { EnvironmentModuleGraph, ModuleGraph } from '../moduleGraph'
-import type { ModuleNode } from '../moduleGraph'
+import { EnvironmentModuleGraph } from '../moduleGraph'
+import type { ModuleNode } from '../mixedModuleGraph'
+import { ModuleGraph } from '../mixedModuleGraph'
 
 describe('moduleGraph', () => {
   describe('invalidateModule', () => {

diff --git a/packages/vite/src/node/server/hmr.ts b/packages/vite/src/node/server/hmr.ts
@@ -16,7 +16,8 @@ import { isExplicitImportRequired } from '../plugins/importAnalysis'
 import { getEnvFilesForMode } from '../env'
 import { withTrailingSlash, wrapId } from '../../shared/utils'
 import type { Plugin } from '../plugin'
-import type { EnvironmentModuleNode, ModuleNode } from './moduleGraph'
+import type { EnvironmentModuleNode } from './moduleGraph'
+import type { ModuleNode } from './mixedModuleGraph'
 import type { DevEnvironment } from './environment'
 import { restartServerWithUrls } from '.'
 

diff --git a/packages/vite/src/node/server/index.ts b/packages/vite/src/node/server/index.ts
@@ -73,8 +73,9 @@ import {
   serveStaticMiddleware,
 } from './middlewares/static'
 import { timeMiddleware } from './middlewares/time'
-import type { EnvironmentModuleNode, ModuleNode } from './moduleGraph'
-import { ModuleGraph } from './moduleGraph'
+import type { EnvironmentModuleNode } from './moduleGraph'
+import { ModuleGraph } from './mixedModuleGraph'
+import type { ModuleNode } from './mixedModuleGraph'
 import { notFoundMiddleware } from './middlewares/notFound'
 import { errorMiddleware, prepareError } from './middlewares/error'
 import type { HMRBroadcaster, HmrOptions, HmrTask } from './hmr'