From 1a9028ae254a38032b683a6ba7fd967a980bf681 Mon Sep 17 00:00:00 2001
From: Manu MA <manu.mtza@gmail.com>
Date: Wed, 19 Oct 2022 13:05:14 +0200
Subject: [PATCH 1/2] feat: include line and column in error format

---
 packages/vite/src/node/server/middlewares/error.ts | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/packages/vite/src/node/server/middlewares/error.ts b/packages/vite/src/node/server/middlewares/error.ts
index 643e90a5c38e83..c53aa19e814096 100644
--- a/packages/vite/src/node/server/middlewares/error.ts
+++ b/packages/vite/src/node/server/middlewares/error.ts
@@ -26,7 +26,11 @@ export function buildErrorMessage(
   includeStack = true
 ): string {
   if (err.plugin) args.push(`  Plugin: ${colors.magenta(err.plugin)}`)
-  if (err.id) args.push(`  File: ${colors.cyan(err.id)}`)
+  let loc = ''
+  if (err.loc) {
+    loc = `:${err.loc.line}:${err.loc.column}`
+  }
+  if (err.id) args.push(`  File: ${colors.cyan(err.id)}${loc}`)
   if (err.frame) args.push(colors.yellow(pad(err.frame)))
   if (includeStack && err.stack) args.push(pad(cleanStack(err.stack)))
   return args.join('\n')

From 78d0cec4f09cd87d668c5a776688e9141b5790ad Mon Sep 17 00:00:00 2001
From: Manu MA <manu.valladolid@gmail.com>
Date: Thu, 20 Oct 2022 12:23:43 +0200
Subject: [PATCH 2/2] Update packages/vite/src/node/server/middlewares/error.ts

Co-authored-by: Ben McCann <322311+benmccann@users.noreply.github.com>
---
 packages/vite/src/node/server/middlewares/error.ts | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/packages/vite/src/node/server/middlewares/error.ts b/packages/vite/src/node/server/middlewares/error.ts
index c53aa19e814096..cbd57f908b62cb 100644
--- a/packages/vite/src/node/server/middlewares/error.ts
+++ b/packages/vite/src/node/server/middlewares/error.ts
@@ -26,10 +26,7 @@ export function buildErrorMessage(
   includeStack = true
 ): string {
   if (err.plugin) args.push(`  Plugin: ${colors.magenta(err.plugin)}`)
-  let loc = ''
-  if (err.loc) {
-    loc = `:${err.loc.line}:${err.loc.column}`
-  }
+  const loc = err.loc ? `:${err.loc.line}:${err.loc.column}` : ''
   if (err.id) args.push(`  File: ${colors.cyan(err.id)}${loc}`)
   if (err.frame) args.push(colors.yellow(pad(err.frame)))
   if (includeStack && err.stack) args.push(pad(cleanStack(err.stack)))