fix: vite resolver using rolldown resolveId kind instead of plugin-commonjs custom.node-resolve.isRequire

Author: underfin

packages/vite/src/node/plugin.ts

@@ -160,6 +160,7 @@ export interface Plugin<T = any> extends RolldownPlugin<T> {
         //  */
         scan?: boolean
         isEntry: boolean
+        kind?: 'import' | 'dynamic-import' | 'require-call'
       },
     ) => Promise<ResolveIdResult> | ResolveIdResult
   >

packages/vite/src/node/plugins/resolve.ts

@@ -178,7 +178,9 @@ export function resolvePlugin(resolveOptions: InternalResolveOptions): Plugin {
 
       // this is passed by @rollup/plugin-commonjs
       const isRequire: boolean =
-        resolveOpts?.custom?.['node-resolve']?.isRequire ?? false
+        resolveOpts?.custom?.['node-resolve']?.isRequire ||
+        /* rolldown */ resolveOpts.kind === 'require-call' ||
+        false
 
       // end user can configure different conditions for ssr and client.
       // falls back to client conditions if no ssr conditions supplied
@@ -453,7 +455,7 @@ export function resolvePlugin(resolveOptions: InternalResolveOptions): Plugin {
           return `module.exports = {}`
         } else {
           id = id.slice(browserExternalId.length + 1)
-          // The rolldown using esbuild interop helper, so here copy the proxy module from https://github.com/vitejs/vite/blob/main/packages/vite/src/node/optimizer/esbuildDepPlugin.ts#L259
+          // The rolldown using esbuild interop helper, so here copy the proxy module from https://github.com/vitejs/vite/blob/main/packages/vite/src/node/optimizer/esbuildDepPlugin.ts#L259-------
           return `\
 module.exports = Object.create(new Proxy({}, {
   get(_, key) {

packages/vite/src/node/server/pluginContainer.ts

@@ -307,10 +307,12 @@ class PluginContainer {
        */
       scan?: boolean
       isEntry?: boolean
+      kind?: 'import' | 'dynamic-import' | 'require-call'
     },
   ): Promise<PartialResolvedId | null> {
     const skip = options?.skip
     const ssr = options?.ssr
+    const kind = options?.kind
     const scan = !!options?.scan
     const ctx = new ResolveIdContext(this, !!ssr, skip, scan)
 
@@ -334,6 +336,7 @@ class PluginContainer {
           isEntry: !!options?.isEntry,
           ssr,
           scan,
+          kind,
         }),
       )
       if (!result) continue