From 43146dc12c201a64afb0d7795e27d71e41c1171d Mon Sep 17 00:00:00 2001
From: Daniel Roe <daniel@roe.dev>
Date: Tue, 20 Apr 2021 21:54:34 +0100
Subject: [PATCH 1/4] fix: respect vue2 sourcemap format

---
 packages/vite/src/node/server/sourcemap.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/vite/src/node/server/sourcemap.ts b/packages/vite/src/node/server/sourcemap.ts
index 79d303391f7e43..709d945f28b3dd 100644
--- a/packages/vite/src/node/server/sourcemap.ts
+++ b/packages/vite/src/node/server/sourcemap.ts
@@ -12,7 +12,7 @@ export async function injectSourcesContent(
   await Promise.all(
     map.sources.map(async (sourcePath, i) => {
       map.sourcesContent![i] = await fs.readFile(
-        path.resolve(sourceRoot, decodeURI(sourcePath)),
+        path.resolve(sourceRoot, decodeURI(sourcePath || file)),
         'utf-8'
       )
     })

From 95a24f39b075376f45aca3193e9066835480e197 Mon Sep 17 00:00:00 2001
From: Daniel Roe <daniel@roe.dev>
Date: Tue, 20 Apr 2021 22:58:38 +0100
Subject: [PATCH 2/4] fix: read file name from sourcemap

---
 packages/vite/src/node/server/sourcemap.ts | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/packages/vite/src/node/server/sourcemap.ts b/packages/vite/src/node/server/sourcemap.ts
index 709d945f28b3dd..2bf9e7f471bd3e 100644
--- a/packages/vite/src/node/server/sourcemap.ts
+++ b/packages/vite/src/node/server/sourcemap.ts
@@ -2,7 +2,12 @@ import { promises as fs } from 'fs'
 import path from 'path'
 
 export async function injectSourcesContent(
-  map: { sources: string[]; sourcesContent?: string[]; sourceRoot?: string },
+  map: {
+    sources: string[]
+    sourcesContent?: string[]
+    sourceRoot?: string
+    file?: string
+  },
   file: string
 ): Promise<void> {
   const sourceRoot = await fs.realpath(
@@ -12,7 +17,7 @@ export async function injectSourcesContent(
   await Promise.all(
     map.sources.map(async (sourcePath, i) => {
       map.sourcesContent![i] = await fs.readFile(
-        path.resolve(sourceRoot, decodeURI(sourcePath || file)),
+        path.resolve(sourceRoot, decodeURI(sourcePath || map.file!)),
         'utf-8'
       )
     })

From 7878816a1c8ed1464f065ba08e9233eca3de8fbe Mon Sep 17 00:00:00 2001
From: Daniel Roe <daniel@roe.dev>
Date: Sat, 24 Apr 2021 14:17:10 +0100
Subject: [PATCH 3/4] refactor: filter out undefined/null sources

---
 packages/vite/src/node/server/sourcemap.ts | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/packages/vite/src/node/server/sourcemap.ts b/packages/vite/src/node/server/sourcemap.ts
index 2bf9e7f471bd3e..e7fddf95c077fa 100644
--- a/packages/vite/src/node/server/sourcemap.ts
+++ b/packages/vite/src/node/server/sourcemap.ts
@@ -2,12 +2,7 @@ import { promises as fs } from 'fs'
 import path from 'path'
 
 export async function injectSourcesContent(
-  map: {
-    sources: string[]
-    sourcesContent?: string[]
-    sourceRoot?: string
-    file?: string
-  },
+  map: { sources: string[]; sourcesContent?: string[]; sourceRoot?: string },
   file: string
 ): Promise<void> {
   const sourceRoot = await fs.realpath(
@@ -16,8 +11,9 @@ export async function injectSourcesContent(
   map.sourcesContent = []
   await Promise.all(
     map.sources.map(async (sourcePath, i) => {
+      if (!sourcePath) return
       map.sourcesContent![i] = await fs.readFile(
-        path.resolve(sourceRoot, decodeURI(sourcePath || map.file!)),
+        path.resolve(sourceRoot, decodeURI(sourcePath)),
         'utf-8'
       )
     })

From fa521b41a0a2801ce8a846cd0bd0449da00df6cf Mon Sep 17 00:00:00 2001
From: Daniel Roe <daniel@roe.dev>
Date: Sat, 24 Apr 2021 19:14:37 +0100
Subject: [PATCH 4/4] refactor: make more readable

---
 packages/vite/src/node/server/sourcemap.ts | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/packages/vite/src/node/server/sourcemap.ts b/packages/vite/src/node/server/sourcemap.ts
index e7fddf95c077fa..5e11f8491443e4 100644
--- a/packages/vite/src/node/server/sourcemap.ts
+++ b/packages/vite/src/node/server/sourcemap.ts
@@ -10,8 +10,7 @@ export async function injectSourcesContent(
   )
   map.sourcesContent = []
   await Promise.all(
-    map.sources.map(async (sourcePath, i) => {
-      if (!sourcePath) return
+    map.sources.filter(Boolean).map(async (sourcePath, i) => {
       map.sourcesContent![i] = await fs.readFile(
         path.resolve(sourceRoot, decodeURI(sourcePath)),
         'utf-8'