fix: using rollupOptions instead of esbuildOptions

packages/vite/src/node/config.ts

@@ -776,10 +776,8 @@ export async function resolveConfig(
     optimizeDeps: {
       disabled: 'build',
       ...optimizeDeps,
-      esbuildOptions: {
-        preserveSymlinks: resolveOptions.preserveSymlinks,
-        ...optimizeDeps.esbuildOptions,
-      },
+      rollupOptions: optimizeDeps.rollupOptions,
+      // TODO preserveSymlinks: resolveOptions.preserveSymlinks,
     },
     worker: resolvedWorkerOptions,
     appType: config.appType ?? 'spa',

packages/vite/src/node/optimizer/esbuildDepPlugin.ts

@@ -50,7 +50,7 @@ const externalTypes = [
   ...KNOWN_ASSET_TYPES,
 ]
 
-export function rollupDepPlugin(
+export function rolldownDepPlugin(
   qualified: Record<string, string>,
   external: string[],
   config: ResolvedConfig,
@@ -278,7 +278,7 @@ const matchesEntireLine = (text: string) => `^${escapeRegex(text)}$`
 
 // esbuild doesn't transpile `require('foo')` into `import` statements if 'foo' is externalized
 // https://github.com/evanw/esbuild/issues/566#issuecomment-735551834
-export function rollupCjsExternalPlugin(
+export function rolldownCjsExternalPlugin(
   externals: string[],
   platform: 'node' | 'browser',
 ): Plugin {

packages/vite/src/node/optimizer/index.ts

@@ -6,7 +6,7 @@ import { performance } from 'node:perf_hooks'
 import type { RollupOptions, RollupOutput } from '@rolldown/node'
 import * as rolldown from '@rolldown/node'
 import colors from 'picocolors'
-import type { BuildOptions as EsbuildBuildOptions } from 'esbuild'
+import type { BuildOptions as EsbuildBuildOptions, Loader } from 'esbuild'
 import { build } from 'esbuild'
 import { init, parse } from 'es-module-lexer'
 import glob from 'fast-glob'
@@ -29,7 +29,10 @@ import {
 } from '../utils'
 import { prettifyMessage, transformWithEsbuild } from '../plugins/esbuild'
 import { ESBUILD_MODULES_TARGET } from '../constants'
-import { rollupCjsExternalPlugin, rollupDepPlugin } from './esbuildDepPlugin'
+import {
+  rolldownCjsExternalPlugin,
+  rolldownDepPlugin,
+} from './esbuildDepPlugin'
 import { scanImports } from './scan'
 import { createOptimizeDepsIncludeResolver, expandGlobIds } from './resolve'
 export {
@@ -617,7 +620,10 @@ export function runOptimizeDeps(
             if (chunk.isEntry) {
               const { exportsData, file, id, ...info } = Object.values(
                 depsInfo,
-              ).find((d) => d.src?.endsWith(chunk.facadeModuleId!))!
+              ).find(
+                (d) =>
+                  d.src === path.join(process.cwd(), chunk.facadeModuleId!),
+              )!
               addOptimizedDepInfo(metadata, 'optimized', {
                 id,
                 file,
@@ -771,9 +777,9 @@ async function prepareRollupOptimizerRun(
     Array.isArray(pluginsFromConfig) ? pluginsFromConfig : [pluginsFromConfig],
   )
   if (external.length) {
-    plugins.push(rollupCjsExternalPlugin(external, platform))
+    plugins.push(rolldownCjsExternalPlugin(external, platform))
   }
-  plugins.push(rollupDepPlugin(flatIdDeps, external, config, ssr))
+  plugins.push(rolldownDepPlugin(flatIdDeps, external, config, ssr))
   plugins.push({
     name: 'optimizer-transform',
     async transform(code, id) {
@@ -1103,18 +1109,19 @@ export async function extractExportsData(
 
   const optimizeDeps = getDepOptimizationConfig(config, ssr)
 
-  const esbuildOptions = optimizeDeps?.esbuildOptions ?? {}
+  const rollupOptions = optimizeDeps?.rollupOptions ?? {}
   if (optimizeDeps.extensions?.some((ext) => filePath.endsWith(ext))) {
     // For custom supported extensions, build the entry file to transform it into JS,
     // and then parse with es-module-lexer. Note that the `bundle` option is not `true`,
     // so only the entry file is being transformed.
-    const result = await build({
-      ...esbuildOptions,
-      entryPoints: [filePath],
-      write: false,
+    const build = await rolldown.rolldown({
+      ...rollupOptions,
+      input: [filePath],
+    })
+    const result = await build.generate({
       format: 'esm',
     })
-    const [imports, exports] = parse(result.outputFiles[0].text)
+    const [imports, exports] = parse(result.output[0].code)
     return {
       hasImports: imports.length > 0,
       exports: exports.map((e) => e.n),
@@ -1128,7 +1135,7 @@ export async function extractExportsData(
   try {
     parseResult = parse(entryContent)
   } catch {
-    const loader = esbuildOptions.loader?.[path.extname(filePath)] || 'jsx'
+    const loader = (path.extname(filePath).slice(1) as Loader) || 'jsx'
     debug?.(
       `Unable to parse: ${filePath}.\n Trying again with a ${loader} transform.`,
     )
@@ -1226,9 +1233,9 @@ export function getDepHash(config: ResolvedConfig, ssr: boolean): string {
       optimizeDeps: {
         include: optimizeDeps?.include,
         exclude: optimizeDeps?.exclude,
-        esbuildOptions: {
-          ...optimizeDeps?.esbuildOptions,
-          plugins: optimizeDeps?.esbuildOptions?.plugins?.map((p) => p.name),
+        rollupOptions: {
+          ...optimizeDeps?.rollupOptions,
+          plugins: optimizeDeps?.rollupOptions?.plugins?.map((p) => p.name),
         },
       },
     },

packages/vite/src/node/optimizer/scan.ts

@@ -204,7 +204,7 @@ async function prepareRolldownScanner(
   plugins.push(rolldownScanPlugin(config, container, deps, missing, entries))
 
   async function build() {
-    await rolldown.rolldown({
+    await rolldown.experimental_scan({
       input: entries,
       // logLevel: 'silent',
       plugins,
@@ -561,9 +561,7 @@ function rolldownScanPlugin(
           contents = config.esbuild.jsxInject + `\n` + contents
         }
 
-        const loader =
-          config.optimizeDeps?.esbuildOptions?.loader?.[`.${ext}`] ||
-          (ext as Loader)
+        const loader = ext as Loader
 
         if (loader !== 'js') {
           contents = (await transform(contents, { loader })).code

packages/vite/src/node/ssr/index.ts

@@ -62,10 +62,8 @@ export function resolveSSROptions(
     optimizeDeps: {
       disabled: true,
       ...optimizeDeps,
-      esbuildOptions: {
-        preserveSymlinks,
-        ...optimizeDeps.esbuildOptions,
-      },
+      // TODO preserveSymlinks
+      rollupOptions: optimizeDeps.rollupOptions,
     },
   }
 }

playground/optimize-deps/vite.config.js

@@ -27,18 +27,15 @@ export default defineConfig({
       '@vitejs/test-dep-optimize-with-glob/**/*.js',
     ],
     exclude: ['@vitejs/test-nested-exclude', '@vitejs/test-dep-non-optimized'],
-    esbuildOptions: {
+    rollupOptions: {
       plugins: [
         {
           name: 'replace-a-file',
-          setup(build) {
-            build.onLoad(
-              { filter: /dep-esbuild-plugin-transform(\\|\/)index\.js$/ },
-              () => ({
-                contents: `export const hello = () => 'Hello from an esbuild plugin'`,
-                loader: 'js',
-              }),
-            )
+          load: (id) => {
+            // eslint-disable-next-line regexp/no-unused-capturing-group
+            if (/dep-esbuild-plugin-transform(\\|\/)index\.js$/.test(id)) {
+              return `export const hello = () => 'Hello from an esbuild plugin'`
+            }
           },
         },
       ],
@@ -142,18 +139,18 @@ function notjs() {
       return {
         optimizeDeps: {
           extensions: ['.notjs'],
-          esbuildOptions: {
+          rollupOptions: {
             plugins: [
               {
                 name: 'esbuild-notjs',
-                setup(build) {
-                  build.onLoad({ filter: /\.notjs$/ }, ({ path }) => {
-                    let contents = fs.readFileSync(path, 'utf-8')
+                load: (id) => {
+                  if (id.endsWith('.notjs')) {
+                    let contents = fs.readFileSync(id, 'utf-8')
                     contents = contents
                       .replace('<notjs>', '')
                       .replace('</notjs>', '')
-                    return { contents, loader: 'js' }
-                  })
+                    return contents
+                  }
                 },
               },
             ],