Always return either json or text

miragejs · Jun 12, 2024 · 45562d1 · 45562d1
1 parent 19a44d2
commit 45562d1
Showing 1 changed file with 10 additions and 5 deletions.
diff --git a/lib/msw-config.ts b/lib/msw-config.ts
@@ -250,14 +250,19 @@ export default class MswConfig {
 
           // Return the correct type of response based on the `accept` header
           const accept = request.headers?.get('accept')?.toLowerCase() || '';
-          if (accept.includes('json')) {
-            return HttpResponse.json(JSON.parse(responseBody || '{}'), init);
+          if (!responseBody) {
+            return new HttpResponse(null, init);
+          } else if (accept.includes('json')) {
+            return HttpResponse.json(JSON.parse(responseBody), init);
           } else if (accept.includes('text')) {
             return HttpResponse.text(responseBody, init);
           } else {
-            throw new Error(
-              `Mirage-msw: Only json and text responses are supported at this time.  Please open an issue requesting support for ${accept}.`
-            );
+            try {
+              const json = JSON.parse(responseBody);
+              return HttpResponse.json(json, init);
+            } catch (e) {
+              return HttpResponse.text(responseBody, init);
+            }
           }
         });
         if (this.msw) {