fix(nuxt): resolve real paths imported into virtual files

danielroe · danielroe · commit 0bb07f129501 · 2025-05-04T23:26:18.000+01:00
diff --git a/packages/nuxt/src/core/plugins/virtual.ts b/packages/nuxt/src/core/plugins/virtual.ts
@@ -11,7 +11,7 @@ interface VirtualFSPluginOptions {
 }
 
 const RELATIVE_ID_RE = /^\.{1,2}[\\/]/
-export const VirtualFSPlugin = (nuxt: Nuxt, options: VirtualFSPluginOptions) => createUnplugin(() => {
+export const VirtualFSPlugin = (nuxt: Nuxt, options: VirtualFSPluginOptions) => createUnplugin((_, meta) => {
   const extensions = ['', ...nuxt.options.extensions]
   const alias = { ...nuxt.options.alias, ...options.alias }
 
@@ -26,31 +26,46 @@ export const VirtualFSPlugin = (nuxt: Nuxt, options: VirtualFSPluginOptions) =>
     }
   }
 
-  return {
-    name: 'nuxt:virtual',
+  function resolveId (id: string, importer?: string) {
+    id = resolveAlias(id, alias)
 
-    resolveId: {
-      order: 'pre',
-      handler (id, importer) {
-        id = resolveAlias(id, alias)
+    if (process.platform === 'win32' && isAbsolute(id)) {
+      // Add back C: prefix on Windows
+      id = resolve(id)
+    }
 
-        if (process.platform === 'win32' && isAbsolute(id)) {
-          // Add back C: prefix on Windows
-          id = resolve(id)
-        }
+    const resolvedId = resolveWithExt(id)
+    if (resolvedId) {
+      return PREFIX + encodeURIComponent(resolvedId)
+    }
 
-        const resolvedId = resolveWithExt(id)
-        if (resolvedId) {
-          return PREFIX + encodeURIComponent(resolvedId)
-        }
+    if (importer && RELATIVE_ID_RE.test(id)) {
+      const path = resolve(dirname(withoutPrefix(decodeURIComponent(importer))), id)
+      // resolve relative paths to virtual files
+      const resolved = resolveWithExt(path)
+      if (resolved) {
+        return PREFIX + encodeURIComponent(resolved)
+      }
+    }
+  }
+
+  return {
+    name: 'nuxt:virtual',
 
-        if (importer && RELATIVE_ID_RE.test(id)) {
-          const path = resolve(dirname(withoutPrefix(decodeURIComponent(importer))), id)
-          const resolved = resolveWithExt(path)
-          if (resolved) {
-            return PREFIX + encodeURIComponent(resolved)
+    resolveId: meta.framework === 'vite' ? undefined : { order: 'pre', handler: resolveId },
+
+    vite: {
+      resolveId: {
+        order: 'pre',
+        handler (id, importer) {
+          const res = resolveId(id, importer)
+          if (res) {
+            return res
           }
-        }
+          if (importer && importer.startsWith(PREFIX) && RELATIVE_ID_RE.test(id)) {
+            return this.resolve?.(id, withoutPrefix(decodeURIComponent(importer)), { skipSelf: true })
+          }
+        },
       },
     },
 
