fix: sourcemapIgnoreList for optimizedDeps (#12633)

Author: patak-dev

packages/vite/src/node/server/middlewares/transform.ts

@@ -2,6 +2,7 @@ import path from 'node:path'
 import fsp from 'node:fs/promises'
 import type { Connect } from 'dep-types/connect'
 import colors from 'picocolors'
+import type { ExistingRawSourceMap } from 'rollup'
 import type { ViteDevServer } from '..'
 import {
   cleanUrl,
@@ -19,6 +20,7 @@ import {
 } from '../../utils'
 import { send } from '../send'
 import { ERR_LOAD_URL, transformRequest } from '../transformRequest'
+import { applySourcemapIgnoreList } from '../sourcemap'
 import { isHTMLProxy } from '../../plugins/html'
 import {
   DEP_VERSION_RE,
@@ -75,14 +77,24 @@ export function transformMiddleware(
         if (depsOptimizer?.isOptimizedDepUrl(url)) {
           // If the browser is requesting a source map for an optimized dep, it
           // means that the dependency has already been pre-bundled and loaded
-          const mapFile = url.startsWith(FS_PREFIX)
+          const sourcemapPath = url.startsWith(FS_PREFIX)
             ? fsPathFromId(url)
             : normalizePath(
                 ensureVolumeInPath(path.resolve(root, url.slice(1))),
               )
           try {
-            const map = await fsp.readFile(mapFile, 'utf-8')
-            return send(req, res, map, 'json', {
+            const map = JSON.parse(
+              await fsp.readFile(sourcemapPath, 'utf-8'),
+            ) as ExistingRawSourceMap
+
+            applySourcemapIgnoreList(
+              map,
+              sourcemapPath,
+              server.config.server.sourcemapIgnoreList,
+              logger,
+            )
+
+            return send(req, res, JSON.stringify(map), 'json', {
               headers: server.config.server.headers,
             })
           } catch (e) {
@@ -91,7 +103,7 @@ export function transformMiddleware(
             // Send back an empty source map so the browser doesn't issue warnings
             const dummySourceMap = {
               version: 3,
-              file: mapFile.replace(/\.map$/, ''),
+              file: sourcemapPath.replace(/\.map$/, ''),
               sources: [],
               sourcesContent: [],
               names: [],

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

@@ -1,6 +1,6 @@
 import path from 'node:path'
 import { promises as fs } from 'node:fs'
-import type { SourceMap } from 'rollup'
+import type { ExistingRawSourceMap, SourceMap } from 'rollup'
 import type { Logger } from '../logger'
 import { createDebugger } from '../utils'
 
@@ -83,3 +83,41 @@ export function getCodeWithSourcemap(
 
   return code
 }
+
+export function applySourcemapIgnoreList(
+  map: ExistingRawSourceMap,
+  sourcemapPath: string,
+  sourcemapIgnoreList: (sourcePath: string, sourcemapPath: string) => boolean,
+  logger?: Logger,
+): void {
+  let { x_google_ignoreList } = map
+  if (x_google_ignoreList === undefined) {
+    x_google_ignoreList = []
+  }
+  for (
+    let sourcesIndex = 0;
+    sourcesIndex < map.sources.length;
+    ++sourcesIndex
+  ) {
+    const sourcePath = map.sources[sourcesIndex]
+    if (!sourcePath) continue
+
+    const ignoreList = sourcemapIgnoreList(
+      path.isAbsolute(sourcePath)
+        ? sourcePath
+        : path.resolve(path.dirname(sourcemapPath), sourcePath),
+      sourcemapPath,
+    )
+    if (logger && typeof ignoreList !== 'boolean') {
+      logger.warn('sourcemapIgnoreList function must return a boolean.')
+    }
+
+    if (ignoreList && !x_google_ignoreList.includes(sourcesIndex)) {
+      x_google_ignoreList.push(sourcesIndex)
+    }
+  }
+
+  if (x_google_ignoreList.length > 0) {
+    if (!map.x_google_ignoreList) map.x_google_ignoreList = x_google_ignoreList
+  }
+}

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

@@ -18,7 +18,7 @@ import {
 } from '../utils'
 import { checkPublicFile } from '../plugins/asset'
 import { getDepsOptimizer } from '../optimizer'
-import { injectSourcesContent } from './sourcemap'
+import { applySourcemapIgnoreList, injectSourcesContent } from './sourcemap'
 import { isFileServingAllowed } from './middlewares/static'
 
 export const ERR_LOAD_URL = 'ERR_LOAD_URL'
@@ -271,41 +271,33 @@ async function loadAndTransform(
     if (map.mappings && !map.sourcesContent) {
       await injectSourcesContent(map, mod.file, logger)
     }
-    for (
-      let sourcesIndex = 0;
-      sourcesIndex < map.sources.length;
-      ++sourcesIndex
-    ) {
-      const sourcePath = map.sources[sourcesIndex]
-      if (!sourcePath) continue
-
-      const sourcemapPath = `${mod.file}.map`
-      const ignoreList = config.server.sourcemapIgnoreList(
-        path.isAbsolute(sourcePath)
-          ? sourcePath
-          : path.resolve(path.dirname(sourcemapPath), sourcePath),
-        sourcemapPath,
-      )
-      if (typeof ignoreList !== 'boolean') {
-        logger.warn('sourcemapIgnoreList function must return a boolean.')
-      }
-      if (ignoreList) {
-        if (map.x_google_ignoreList === undefined) {
-          map.x_google_ignoreList = []
-        }
-        if (!map.x_google_ignoreList.includes(sourcesIndex)) {
-          map.x_google_ignoreList.push(sourcesIndex)
-        }
-      }
 
-      // Rewrite sources to relative paths to give debuggers the chance
-      // to resolve and display them in a meaningful way (rather than
-      // with absolute paths).
-      if (path.isAbsolute(sourcePath) && path.isAbsolute(mod.file)) {
-        map.sources[sourcesIndex] = path.relative(
-          path.dirname(mod.file),
-          sourcePath,
-        )
+    const sourcemapPath = `${mod.file}.map`
+    applySourcemapIgnoreList(
+      map,
+      sourcemapPath,
+      config.server.sourcemapIgnoreList,
+      logger,
+    )
+
+    if (path.isAbsolute(mod.file)) {
+      for (
+        let sourcesIndex = 0;
+        sourcesIndex < map.sources.length;
+        ++sourcesIndex
+      ) {
+        const sourcePath = map.sources[sourcesIndex]
+        if (sourcePath) {
+          // Rewrite sources to relative paths to give debuggers the chance
+          // to resolve and display them in a meaningful way (rather than
+          // with absolute paths).
+          if (path.isAbsolute(sourcePath)) {
+            map.sources[sourcesIndex] = path.relative(
+              path.dirname(mod.file),
+              sourcePath,
+            )
+          }
+        }
       }
     }
   }