fix(node): update call stripBase in utils.ts before passing to fsPath…

…FromUrl (fix vitejs#9438)
xinxinhe1810 · Jul 4, 2023 · fa92a74 · fa92a74
1 parent 2b1ffe8
commit fa92a74
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/packages/vite/src/node/plugins/importAnalysis.ts b/packages/vite/src/node/plugins/importAnalysis.ts
@@ -556,8 +556,10 @@ export function importAnalysisPlugin(config: ResolvedConfig): Plugin {
               }
             }
 
-            // record as safe modules
-            server?.moduleGraph.safeModulesPath.add(fsPathFromUrl(url))
+            // record as safe modules # stripBase: https://github.com/vitejs/vite/issues/9438#issuecomment-1486662486
+            server?.moduleGraph.safeModulesPath.add(
+              fsPathFromUrl(stripBase(url, base)),
+            )
 
             if (url !== specifier) {
               let rewriteDone = false

diff --git a/packages/vite/src/node/server/middlewares/static.ts b/packages/vite/src/node/server/middlewares/static.ts
@@ -19,6 +19,7 @@ import {
   removeLeadingSlash,
   shouldServeFile,
   slash,
+  stripBase,
 } from '../../utils'
 
 const knownJavascriptExtensionRE = /\.[tj]sx?$/
@@ -194,7 +195,8 @@ export function isFileServingAllowed(
 ): boolean {
   if (!server.config.server.fs.strict) return true
 
-  const file = fsPathFromUrl(url)
+  // stripBase: https://github.com/vitejs/vite/issues/9438#issuecomment-1486662486
+  const file = fsPathFromUrl(stripBase(url, server.config.rawBase))
 
   if (server._fsDenyGlob(file)) return false