chore: use convertSpanUtf16 and remove compat layer

Author: sapphi-red

packages/vite/src/node/parseAst.ts

@@ -1,7 +1,3 @@
-import MagicString, {
-  type SourceMap,
-  type SourceMapOptions,
-} from 'magic-string'
 import {
   type ParseResult,
   parseAst as rolldownParseAst,
@@ -19,6 +15,7 @@ const parseAstGeneric = (
     sourceType: 'module',
     lang: 'js',
     preserveParens: false,
+    convertSpanUtf16: true,
     ...opts,
   })
   if (result.errors.length > 0) {
@@ -37,6 +34,7 @@ export const parseAstGenericAsync = async (
     sourceType: 'module',
     lang: 'js',
     preserveParens: false,
+    convertSpanUtf16: true,
     ...opts,
   })
   if (result.errors.length > 0) {
@@ -46,52 +44,6 @@ export const parseAstGenericAsync = async (
   return result
 }
 
-export class MagicStringWrapper {
-  private oxcMs: ParseResult['magicString']
-  private ms: MagicString
-
-  constructor(s: ParseResult['magicString']) {
-    this.oxcMs = s
-    this.ms = new MagicString(s.toString())
-  }
-
-  private getO(pos: number): number {
-    return this.oxcMs.getUtf16ByteOffset(pos)
-  }
-
-  append(str: string): void {
-    this.ms.append(str)
-  }
-
-  appendLeft(start: number, str: string): void {
-    this.ms.appendLeft(this.getO(start), str)
-  }
-
-  prependRight(start: number, str: string): void {
-    this.ms.prependRight(this.getO(start), str)
-  }
-
-  update(start: number, end: number, str: string): void {
-    this.ms.update(this.getO(start), this.getO(end), str)
-  }
-
-  move(start: number, end: number, index: number): void {
-    this.ms.move(this.getO(start), this.getO(end), this.getO(index))
-  }
-
-  remove(start: number, end: number): void {
-    this.ms.remove(this.getO(start), this.getO(end))
-  }
-
-  generateMap(options: SourceMapOptions): SourceMap {
-    return this.ms.generateMap(options)
-  }
-
-  toString(): string {
-    return this.ms.toString()
-  }
-}
-
 export const parseAst = (code: string, opts?: any, filename?: string): any => {
   return parseAstGeneric(code, opts, filename).program
 }

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

@@ -1,4 +1,5 @@
 import path from 'node:path'
+import MagicString from 'magic-string'
 import type { RollupAstNode } from 'rollup'
 import type { SourceMap } from 'rolldown'
 import type {
@@ -17,10 +18,7 @@ import type {
 import { extract_names as extractNames } from 'periscopic'
 import { walk as eswalk } from 'estree-walker'
 import type { RawSourceMap } from '@ampproject/remapping'
-import {
-  MagicStringWrapper,
-  parseAstGenericAsync as rolldownParseAstGenericAsync,
-} from '../parseAst'
+import { parseAstAsync as rolldownParseAstAsync } from '../parseAst'
 import type { TransformResult } from '../server/transformRequest'
 import {
   combineSourcemaps,
@@ -82,12 +80,10 @@ async function ssrTransformScript(
   url: string,
   originalCode: string,
 ): Promise<TransformResult | null> {
+  const s = new MagicString(code)
   let ast: any
-  let s: MagicStringWrapper
   try {
-    const result = await rolldownParseAstGenericAsync(code)
-    ast = result.program
-    s = new MagicStringWrapper(result.magicString)
+    ast = await rolldownParseAstAsync(code)
   } catch (err) {
     // enhance known rollup errors
     // https://github.com/rollup/rollup/blob/42e587e0e37bc0661aa39fe7ad6f1d7fd33f825c/src/utils/bufferToAst.ts#L17-L22