fix(ssrTransform): sourcemaps with multiple sources

vitejs · Jul 14, 2024 · 386a52d · 386a52d
1 parent 07bc489
commit 386a52d
Show file tree

Hide file tree

Showing 4 changed files with 74 additions and 4 deletions.
diff --git a/packages/vite/src/node/ssr/__tests__/fixtures/bundled-with-sourcemaps/bundle.js b/packages/vite/src/node/ssr/__tests__/fixtures/bundled-with-sourcemaps/bundle.js
diff --git a/packages/vite/src/node/ssr/__tests__/fixtures/bundled-with-sourcemaps/bundle.js.map b/packages/vite/src/node/ssr/__tests__/fixtures/bundled-with-sourcemaps/bundle.js.map
diff --git a/packages/vite/src/node/ssr/__tests__/ssrTransform.spec.ts b/packages/vite/src/node/ssr/__tests__/ssrTransform.spec.ts
@@ -1,4 +1,6 @@
-import { expect, test } from 'vitest'
+import { readFileSync } from 'node:fs'
+import { assert, expect, test } from 'vitest'
+import type { SourceMap } from 'rollup'
 import { transformWithEsbuild } from '../../plugins/esbuild'
 import { ssrTransform } from '../ssrTransform'
 
@@ -411,11 +413,33 @@ test('sourcemap source', async () => {
       'input.js',
       'export const a = 1 /* */',
     )
-  )?.map
+  )?.map as SourceMap
+
   expect(map?.sources).toStrictEqual(['input.js'])
   expect(map?.sourcesContent).toStrictEqual(['export const a = 1 /* */'])
 })
 
+test('sourcemap with multiple sources', async () => {
+  const code = readFixture('bundle.js')
+  const map = readFixture('bundle.js.map')
+
+  const result = await ssrTransform(code, JSON.parse(map), '', code)
+  assert(result?.map)
+
+  const { sources } = result.map as SourceMap
+  expect(sources).toContain('./first.ts')
+  expect(sources).toContain('./second.ts')
+
+  function readFixture(filename: string) {
+    const url = new URL(
+      `./fixtures/bundled-with-sourcemaps/${filename}`,
+      import.meta.url,
+    )
+
+    return readFileSync(url.pathname, 'utf8')
+  }
+})
+
 test('overwrite bindings', async () => {
   expect(
     await ssrTransformSimpleCode(

diff --git a/packages/vite/src/node/utils.ts b/packages/vite/src/node/utils.ts
@@ -852,7 +852,6 @@ export function combineSourcemaps(
     }
     return newSourcemaps
   })
-  const escapedFilename = escapeToLinuxLikePath(filename)
 
   // We don't declare type here so we can convert/fake/map as RawSourceMap
   let map //: SourceMap
@@ -863,7 +862,7 @@ export function combineSourcemaps(
     map = remapping(sourcemapList, () => null)
   } else {
     map = remapping(sourcemapList[0], function loader(sourcefile) {
-      if (sourcefile === escapedFilename && sourcemapList[mapIndex]) {
+      if (sourcemapList[mapIndex]) {
         return sourcemapList[mapIndex++]
       } else {
         return null