From 0828599e4f4b010a157206df5b6116e0e11d0328 Mon Sep 17 00:00:00 2001 From: Gregory Schier Date: Sat, 8 Mar 2025 08:34:41 -0800 Subject: [PATCH] Don't switch to XML for HTML responses. Fixes https://feedback.yaak.app/p/issue-with-rendering-html-responses-after-update --- src-web/lib/contentType.ts | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/src-web/lib/contentType.ts b/src-web/lib/contentType.ts index d3ffb740..5f12a366 100644 --- a/src-web/lib/contentType.ts +++ b/src-web/lib/contentType.ts @@ -11,7 +11,13 @@ export function languageFromContentType( } else if (justContentType.includes('xml')) { return 'xml'; } else if (justContentType.includes('html')) { - return detectFromContent(content, 'html'); + const detected = detectFromContent(content, 'html'); + if (detected === 'xml') { + // If it's detected as XML, but is already HTML, don't change it + return 'html'; + } else { + return detected; + } } else if (justContentType.includes('javascript')) { return 'javascript'; } @@ -26,7 +32,6 @@ function detectFromContent( if (content == null) return 'text'; const firstBytes = content.slice(0, 20).trim(); - console.log("FIRST BYTES", firstBytes); if (firstBytes.startsWith('{') || firstBytes.startsWith('[')) { return 'json';