fix(vite): use resolveId from vite-node to resolve deps (#30922)

packages/vite/src/runtime/vite-node.mjs

@@ -39,6 +39,9 @@ function createRunner () {
   return new ViteNodeRunner({
     root: viteNodeOptions.root, // Equals to Nuxt `srcDir`
     base: viteNodeOptions.base,
+    async resolveId (id, importer) {
+      return await viteNodeFetch('/resolve/' + encodeURIComponent(id) + (importer ? '?importer=' + encodeURIComponent(importer) : '')) ?? undefined
+    },
     async fetchModule (id) {
       id = id.replace(/\/\//g, '/') // TODO: fix in vite-node
       return await viteNodeFetch('/module/' + encodeURI(id)).catch((err) => {

packages/vite/src/vite-node.ts

@@ -1,18 +1,16 @@
 import { writeFile } from 'node:fs/promises'
 import { pathToFileURL } from 'node:url'
-import { createApp, createError, defineEventHandler, defineLazyEventHandler, eventHandler, toNodeListener } from 'h3'
+import { createApp, createError, defineEventHandler, toNodeListener } from 'h3'
 import { ViteNodeServer } from 'vite-node/server'
 import { isAbsolute, normalize, resolve } from 'pathe'
 // import { addDevServerHandler } from '@nuxt/kit'
 import { isFileServingAllowed } from 'vite'
-import type { ModuleNode, Plugin as VitePlugin } from 'vite'
+import type { ModuleNode, ViteDevServer, Plugin as VitePlugin } from 'vite'
 import { getQuery } from 'ufo'
 import { normalizeViteManifest } from 'vue-bundle-renderer'
-import { resolve as resolveModule } from 'mlly'
 import { distDir } from './dirs'
 import type { ViteBuildContext } from './vite'
 import { isCSS } from './utils'
-import { createIsExternal } from './utils/external'
 
 // TODO: Remove this in favor of registerViteNodeMiddleware
 // after Nitropack or h3 allows adding middleware after setup
@@ -101,6 +99,19 @@ function getManifest (ctx: ViteBuildContext) {
 function createViteNodeApp (ctx: ViteBuildContext, invalidates: Set<string> = new Set()) {
   const app = createApp()
 
+  let _node: ViteNodeServer | undefined
+  function getNode (server: ViteDevServer) {
+    return _node ||= new ViteNodeServer(server, {
+      deps: {
+        inline: [/^#/, /\?/],
+      },
+      transformMode: {
+        ssr: [/.*/],
+        web: [],
+      },
+    })
+  }
+
   app.use('/manifest', defineEventHandler(() => {
     const manifest = getManifest(ctx)
     return manifest
@@ -112,39 +123,24 @@ function createViteNodeApp (ctx: ViteBuildContext, invalidates: Set<string> = ne
     return ids
   }))
 
-  app.use('/module', defineLazyEventHandler(() => {
+  const RESOLVE_RE = /^\/(?<id>[^?]+)(?:\?importer=(?<importer>.*))?$/
-    const viteServer = ctx.ssrServer!
+  app.use('/resolve', defineEventHandler(async (event) => {
-    const node = new ViteNodeServer(viteServer, {
+    const { id, importer } = event.path.match(RESOLVE_RE)?.groups || {}
-      deps: {
+    if (!id || !ctx.ssrServer) {
-        inline: [
-          // Common
-          /^#/,
-          /\?/,
-        ],
-      },
-      transformMode: {
-        ssr: [/.*/],
-        web: [],
-      },
-    })
-
-    const isExternal = createIsExternal(viteServer, ctx.nuxt)
-    node.shouldExternalize = async (id: string) => {
-      const result = await isExternal(id)
-      if (result?.external) {
-        return resolveModule(result.id, { url: ctx.nuxt.options.modulesDir }).catch(() => false)
-      }
-      return false
-    }
-
-    return eventHandler(async (event) => {
-      const moduleId = decodeURI(event.path).substring(1)
-      if (moduleId === '/') {
       throw createError({ statusCode: 400 })
     }
-      if (isAbsolute(moduleId) && !isFileServingAllowed(moduleId, viteServer)) {
+    return await getNode(ctx.ssrServer).resolveId(decodeURIComponent(id), importer ? decodeURIComponent(importer) : undefined).catch(() => null)
+  }))
+
+  app.use('/module', defineEventHandler(async (event) => {
+    const moduleId = decodeURI(event.path).substring(1)
+    if (moduleId === '/' || !ctx.ssrServer) {
+      throw createError({ statusCode: 400 })
+    }
+    if (isAbsolute(moduleId) && !isFileServingAllowed(ctx.ssrServer.config, moduleId)) {
       throw createError({ statusCode: 403 /* Restricted */ })
     }
+    const node = getNode(ctx.ssrServer)
     const module = await node.fetchModule(moduleId).catch(async (err) => {
       const errorData = {
         code: 'VITE_ERROR',
@@ -159,7 +155,6 @@ function createViteNodeApp (ctx: ViteBuildContext, invalidates: Set<string> = ne
       throw createError({ data: errorData })
     })
     return module
-    })
   }))
 
   return app