Merge branch 'main' into feat-browser-clipboard

vitest-dev · Dec 23, 2024 · 59d2fd2 · 59d2fd2
2 parents c73e0d7 + 31675e3
commit 59d2fd2
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 2 deletions.
diff --git a/packages/vite-node/src/utils.ts b/packages/vite-node/src/utils.ts
@@ -35,11 +35,14 @@ export function normalizeRequestId(id: string, base?: string): string {
     id = id.replace(driveOppositeRegext, `${drive}$1`)
   }
 
+  if (id.startsWith('file://')) {
+    return fileURLToPath(id)
+  }
+
   return id
     .replace(/^\/@id\/__x00__/, '\0') // virtual modules start with `\0`
     .replace(/^\/@id\//, '')
     .replace(/^__vite-browser-external:/, '')
-    .replace(/^file:(\/+)/, isWindows ? '' : '/') // remove file protocol and duplicate leading slashes
     .replace(/\?v=\w+/, '?') // remove ?v= query
     .replace(/&v=\w+/, '') // remove &v= query
     .replace(/\?t=\w+/, '?') // remove ?t= query
@@ -89,10 +92,12 @@ export function normalizeModuleId(id: string) {
   if (prefixedBuiltins.has(id)) {
     return id
   }
+  if (id.startsWith('file://')) {
+    return fileURLToPath(id)
+  }
   return id
     .replace(/\\/g, '/')
     .replace(/^\/@fs\//, isWindows ? '' : '/')
-    .replace(/^file:\//, '/')
     .replace(/^node:/, '')
     .replace(/^\/+/, '/')
 }

diff --git a/test/core/test/resolve-file-url.test.ts b/test/core/test/resolve-file-url.test.ts
@@ -0,0 +1,7 @@
+import { expect, test } from 'vitest'
+
+test('resolve file url', async () => {
+  const fileUrl = new URL('./resolve-file-url%7Edep.js', import.meta.url).href
+  const mod = await import(fileUrl)
+  expect(mod.default).toMatchInlineSnapshot(`"[ok]"`)
+})
diff --git a/test/core/test/resolve-file-url~dep.js b/test/core/test/resolve-file-url~dep.js
@@ -0,0 +1 @@
+export default '[ok]'