chore: fixes for newer rolldown

Author: sapphi-red

packages/vite/rollup.dts.config.ts

@@ -52,12 +52,11 @@ const identifierReplacements: Record<string, Record<string, string>> = {
     PluginContext$1: 'rolldown.PluginContext',
     MinimalPluginContext$1: 'rolldown.MinimalPluginContext',
     TransformPluginContext$1: 'rolldown.TransformPluginContext',
-    TransformResult$2: 'rolldown.TransformResult',
-    RollupOptions$1: 'rolldown.RollupOptions',
+    TransformResult$1: 'rolldown.TransformResult',
   },
   'rolldown/experimental': {
     TransformOptions$1: 'rolldown_experimental_TransformOptions',
-    TransformResult$1: 'rolldown_experimental_TransformResult',
+    TransformResult$2: 'rolldown_experimental_TransformResult',
   },
   'node:https': {
     Server$1: 'HttpsServer',

packages/vite/src/node/__tests__/build.spec.ts

@@ -886,7 +886,8 @@ test.skip('adjust worker build error for worker.format', async () => {
   expect.unreachable()
 })
 
-describe('onRollupLog', () => {
+// rolldown does not append plugin name to the message automatically
+describe.skip('onRollupLog', () => {
   const pluginName = 'rollup-plugin-test'
   const msgInfo = 'This is the INFO message.'
   const msgWarn = 'This is the WARN message.'

packages/vite/src/node/build.ts

@@ -5,8 +5,8 @@ import type {
   ExternalOption,
   InputOption,
   InternalModuleFormat,
-  LogLevel,
-  LogOrStringHandler,
+  // LogLevel,
+  // LogOrStringHandler,
   ModuleFormat,
   OutputBundle,
   OutputChunk,
@@ -19,7 +19,7 @@ import type {
   RollupError,
   RollupLog,
   // RollupWatcher,
-  WarningHandlerWithDefault,
+  // WarningHandlerWithDefault,
   // WatcherOptions,
 } from 'rolldown'
 import {
@@ -87,6 +87,17 @@ import {
 import type { MinimalPluginContext, Plugin, PluginContext } from './plugin'
 import type { RollupPluginHooks } from './typeUtils'
 
+// TODO: import from rolldown
+type LogLevel = 'info' | 'debug' | 'warn'
+type LogOrStringHandler = (
+  level: LogLevel | 'error',
+  log: RollupLog | string,
+) => void
+type WarningHandlerWithDefault = (
+  warning: RollupLog,
+  defaultHandler: import('rolldown').LoggingFunction,
+) => void
+
 export interface BuildEnvironmentOptions {
   /**
    * Compatibility transform target. The transform is performed with esbuild

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

@@ -46,7 +46,7 @@ import type {
   ParallelPluginHooks,
   PartialNull,
   PartialResolvedId,
-  PluginContextMeta,
+  // PluginContextMeta,
   ResolvedId,
   RollupError,
   RollupLog,
@@ -90,6 +90,9 @@ import type {
   EnvironmentModuleNode,
 } from './moduleGraph'
 
+// TODO: import from rolldown
+type PluginContextMeta = RollupMinimalPluginContext['meta']
+
 // same default value of "moduleInfo.meta" as in Rollup
 const EMPTY_OBJECT = Object.freeze({})
 
@@ -562,6 +565,12 @@ class MinimalPluginContext implements RollupMinimalPluginContext {
     public environment: Environment,
   ) {}
 
+  // FIXME: properly support this later
+  // eslint-disable-next-line @typescript-eslint/class-literal-property-style
+  get pluginName() {
+    return ''
+  }
+
   debug(rawLog: string | RollupLog | (() => string | RollupLog)): void {
     const log = this._normalizeRawLog(rawLog)
     const msg = buildErrorMessage(log, [`debug: ${log.message}`], false)
@@ -608,9 +617,8 @@ class PluginContext
   _resolveSkips?: Set<Plugin>
   _resolveSkipCalls?: readonly SkipInformation[]
 
-  get pluginName() {
-    // TODO(sapphi-red): remove `!` later
-    return this._plugin.name!
+  override get pluginName() {
+    return this._plugin.name
   }
 
   constructor(
@@ -1038,7 +1046,12 @@ export type {
 
 // Backward compatibility
 class PluginContainer {
-  constructor(private environments: Record<string, Environment>) {}
+  // TODO: revert this workaround later when https://github.com/oxc-project/oxc/issues/8917 is fixed
+  private environments: Record<string, Environment>
+
+  constructor(environments: Record<string, Environment>) {
+    this.environments = environments
+  }
 
   // Backward compatibility
   // Users should call pluginContainer.resolveId (and load/transform) passing the environment they want to work with