fix(ssr): check esm file with normal file path (#15307)

vitejs · Dec 11, 2023 · 1597170 · 1597170
1 parent 103820f
commit 1597170
Showing 1 changed file with 7 additions and 6 deletions.
diff --git a/packages/vite/src/node/ssr/ssrModuleLoader.ts b/packages/vite/src/node/ssr/ssrModuleLoader.ts
@@ -291,8 +291,8 @@ async function nodeImport(
   metadata?: SSRImportMetadata,
 ) {
   let url: string
-  const isRuntimeHandled = id.startsWith('data:') || isBuiltin(id)
-  if (isRuntimeHandled) {
+  let filePath: string | undefined
+  if (id.startsWith('data:') || isBuiltin(id)) {
     url = id
   } else {
     const resolved = tryNodeResolve(
@@ -310,24 +310,25 @@ async function nodeImport(
       err.code = 'ERR_MODULE_NOT_FOUND'
       throw err
     }
+    filePath = resolved.id
     url = pathToFileURL(resolved.id).toString()
   }
 
   const mod = await import(url)
 
   if (resolveOptions.legacyProxySsrExternalModules) {
     return proxyESM(mod)
-  } else if (isRuntimeHandled) {
-    return mod
-  } else {
+  } else if (filePath) {
     analyzeImportedModDifference(
       mod,
-      url,
+      filePath,
       id,
       metadata,
       resolveOptions.packageCache,
     )
     return proxyGuardOnlyEsm(mod, id)
+  } else {
+    return mod
   }
 }