refactor: move safeModulesPath set to server

vitejs · Mar 11, 2024 · 95ae29b · 95ae29b
1 parent 4808b27
commit 95ae29b
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 12 deletions.
diff --git a/packages/vite/src/node/plugins/importAnalysis.ts b/packages/vite/src/node/plugins/importAnalysis.ts
@@ -525,9 +525,7 @@ export function importAnalysisPlugin(config: ResolvedConfig): Plugin {
             // record as safe modules
             // safeModulesPath should not include the base prefix.
             // See https://github.com/vitejs/vite/issues/9438#issuecomment-1465270409
-            server?.browserEnvironment.moduleGraph.safeModulesPath.add(
-              fsPathFromUrl(stripBase(url, base)),
-            )
+            server?._safeModulesPath.add(fsPathFromUrl(stripBase(url, base)))
 
             if (url !== specifier) {
               let rewriteDone = false

diff --git a/packages/vite/src/node/server/index.ts b/packages/vite/src/node/server/index.ts
@@ -385,6 +385,10 @@ export interface ViteDevServer {
       abort: () => void
     }
   >
+  /**
+   * @internal
+   */
+  _safeModulesPath: Set<string>
   /**
    * @internal
    */
@@ -696,6 +700,7 @@ export async function _createServer(
     _importGlobMap: new Map(),
     _forceOptimizeOnRestart: false,
     _pendingRequests: new Map(),
+    _safeModulesPath: new Set(),
     _fsDenyGlob: picomatch(config.server.fs.deny, {
       matchBase: true,
       nocase: true,

diff --git a/packages/vite/src/node/server/middlewares/static.ts b/packages/vite/src/node/server/middlewares/static.ts
@@ -217,8 +217,7 @@ export function isFileServingAllowed(
 
   if (server._fsDenyGlob(file)) return false
 
-  if (server.browserEnvironment.moduleGraph.safeModulesPath.has(file))
-    return true // TODO: safeModulePaths shouldn't be part of a moduleGraph
+  if (server._safeModulesPath.has(file)) return true
 
   if (
     server.config.server.fs.allow.some(

diff --git a/packages/vite/src/node/server/moduleGraph.ts b/packages/vite/src/node/server/moduleGraph.ts
@@ -86,9 +86,6 @@ export class EnvironmentModuleGraph {
   // a single file may corresponds to multiple modules with different queries
   fileToModulesMap = new Map<string, Set<EnvironmentModuleNode>>()
 
-  // TODO: this property should be shared across all module graphs
-  safeModulesPath = new Set<string>()
-
   /**
    * @internal
    */
@@ -634,10 +631,6 @@ export class ModuleGraph {
 
   fileToModulesMap: Map<string, Set<ModuleNode>>
 
-  get safeModulesPath(): Set<string> {
-    return this._browser.safeModulesPath
-  }
-
   constructor(moduleGraphs: {
     browser: EnvironmentModuleGraph
     node: EnvironmentModuleGraph