fix: sourcemaps windows drive letter inconsistency, fix 4964 (vitejs#…

…4985)
aleclarson · Nov 8, 2021 · da42f5e · da42f5e
1 parent e2f0aff
commit da42f5e
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 14 deletions.
diff --git a/packages/vite/src/node/plugins/esbuild.ts b/packages/vite/src/node/plugins/esbuild.ts
@@ -12,7 +12,8 @@ import {
  cleanUrl,
  createDebugger,
  ensureWatchedFile,
- generateCodeFrame
+ generateCodeFrame,
+ toUpperCaseDriveLetter
 } from '../utils'
 import { RawSourceMap } from '@ampproject/remapping/dist/types/types'
 import { SourceMap } from 'rollup'
@@ -126,23 +127,25 @@ export async function transformWithEsbuild(
 
  try {
  const result = await transform(code, resolvedOptions)
+ let map: SourceMap
  if (inMap && resolvedOptions.sourcemap) {
  const nextMap = JSON.parse(result.map)
  nextMap.sourcesContent = []
- return {
- ...result,
- map: combineSourcemaps(filename, [
- nextMap as RawSourceMap,
- inMap as RawSourceMap
- ]) as SourceMap
- }
+ map = combineSourcemaps(filename, [
+ nextMap as RawSourceMap,
+ inMap as RawSourceMap
+ ]) as SourceMap
  } else {
- return {
- ...result,
- map: resolvedOptions.sourcemap
- ? JSON.parse(result.map)
- : { mappings: '' }
- }
+ map = resolvedOptions.sourcemap
+ ? JSON.parse(result.map)
+ : { mappings: '' }
+ }
+ if (Array.isArray(map.sources)) {
+ map.sources = map.sources.map((it) => toUpperCaseDriveLetter(it))
+ }
+ return {
+ ...result,
+ map
  }
  } catch (e) {
  debug(`esbuild error with options used: `, resolvedOptions)

diff --git a/packages/vite/src/node/utils.ts b/packages/vite/src/node/utils.ts
@@ -561,5 +561,9 @@ export function arraify<T>(target: T | T[]): T[] {
  return Array.isArray(target) ? target : [target]
 }
 
+export function toUpperCaseDriveLetter(pathName: string): string {
+ return pathName.replace(/^\w:/, letter => letter.toUpperCase())
+}
+
 export const multilineCommentsRE = /\/\*(.|[\r\n])*?\*\//gm
 export const singlelineCommentsRE = /\/\/.*/g