Use a file URL when we can

vitejs · Oct 15, 2021 · d2a0d48 · d2a0d48
1 parent ea7380a
commit d2a0d48
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/packages/vite/src/node/ssr/ssrModuleLoader.ts b/packages/vite/src/node/ssr/ssrModuleLoader.ts
@@ -2,7 +2,7 @@ import fs from 'fs'
 import path from 'path'
 import { pathToFileURL } from 'url'
 import { ViteDevServer } from '..'
-import { dynamicImport, cleanUrl, isBuiltin, resolveFrom, unwrapId } from '../utils'
+import { dynamicImport, cleanUrl, isBuiltin, resolveFrom, unwrapId, usingDynamicImport } from '../utils'
 import { rebindErrorStacktrace, ssrRewriteStacktrace } from './ssrStacktrace'
 import {
   ssrExportAllKey,
@@ -185,6 +185,9 @@ async function nodeImport(
     url = id
   } else {
     url = resolve(id, importer, config.root, !!config.resolve.preserveSymlinks)
+    if (usingDynamicImport) {
+      url = pathToFileURL(url).toString()
+    }
   }
   const mod = await dynamicImport(url)
   return proxyESM(id, mod)

diff --git a/packages/vite/src/node/utils.ts b/packages/vite/src/node/utils.ts
@@ -569,6 +569,7 @@ export function toUpperCaseDriveLetter(pathName: string): string {
 export const multilineCommentsRE = /\/\*(.|[\r\n])*?\*\//gm
 export const singlelineCommentsRE = /\/\/.*/g
 
+export const usingDynamicImport = typeof jest === 'undefined';
 /**
  * Dynamically import files. It will make sure it's not being compiled away by TS/Rollup.
  *
@@ -578,4 +579,4 @@ export const singlelineCommentsRE = /\/\/.*/g
  *
  * @param file File path to import.
  */
-export const dynamicImport = typeof jest === 'undefined' ? new Function('file', 'return import(file)') : require;
+export const dynamicImport = usingDynamicImport ? new Function('file', 'return import(file)') : require;