From 4a89508b50b1db4e428f9dab2ad08274bc10cc14 Mon Sep 17 00:00:00 2001 From: Lea Anthony Date: Sat, 29 Jan 2022 10:21:07 +1100 Subject: [PATCH] Fixes #1108 (#1115) --- v2/internal/frontend/assetserver/mimecache.go | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/v2/internal/frontend/assetserver/mimecache.go b/v2/internal/frontend/assetserver/mimecache.go index ae33f7a54..6d402ccbe 100644 --- a/v2/internal/frontend/assetserver/mimecache.go +++ b/v2/internal/frontend/assetserver/mimecache.go @@ -3,7 +3,6 @@ package assetserver import ( "net/http" "path/filepath" - "strings" "sync" "github.com/gabriel-vasile/mimetype" @@ -18,6 +17,14 @@ func GetMimetype(filename string, data []byte) string { mutex.Lock() defer mutex.Unlock() + if filepath.Ext(filename) == ".js" { + return "application/javascript" + } + + if filepath.Ext(filename) == ".css" { + return "text/css" + } + result := cache[filename] if result != "" { return result @@ -30,14 +37,6 @@ func GetMimetype(filename string, data []byte) string { result = detect.String() } - if filepath.Ext(filename) == ".css" && strings.HasPrefix(result, "text/plain") { - result = strings.Replace(result, "text/plain", "text/css", 1) - } - - if filepath.Ext(filename) == ".js" && strings.HasPrefix(result, "text/plain") { - result = strings.Replace(result, "text/plain", "text/javascript", 1) - } - if result == "" { result = "application/octet-stream" }