From 8c348503fc96f05f5b554930d54934ddf774e897 Mon Sep 17 00:00:00 2001
From: bholmesdev <hey@bholmes.dev>
Date: Thu, 2 Mar 2023 12:20:09 -0500
Subject: [PATCH] chore: hand `mjs` highlighting in error overlay

---
 packages/astro/src/core/errors/dev/vite.ts | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/packages/astro/src/core/errors/dev/vite.ts b/packages/astro/src/core/errors/dev/vite.ts
index 3a94f9749..5d28ad5f8 100644
--- a/packages/astro/src/core/errors/dev/vite.ts
+++ b/packages/astro/src/core/errors/dev/vite.ts
@@ -150,9 +150,15 @@ export async function getViteErrorPayload(err: ErrorWithMetadata): Promise<Astro
 		: undefined;
 
 	const highlighter = await getHighlighter({ theme: 'css-variables' });
+	let highlighterLang = err.loc?.file?.split('.').pop();
+	if (['cjs', 'mjs'].includes(highlighterLang ?? '')) {
+		// Shiki does not support `mjs` or `cjs` aliases by default.
+		// Map these to `js` instead.
+		highlighterLang = 'js';
+	}
 	const highlightedCode = err.fullCode
 		? highlighter.codeToHtml(err.fullCode, {
-				lang: err.loc?.file?.split('.').pop(),
+				lang: highlighterLang,
 				lineOptions: err.loc?.line ? [{ line: err.loc.line, classes: ['error-line'] }] : undefined,
 		  })
 		: undefined;