fix #1550, add "X-Content-Raw" header

solidjs · Jun 18, 2024 · 23ee2de · 23ee2de
1 parent bfdd099
commit 23ee2de
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 22 deletions.
diff --git a/.changeset/new-glasses-march.md b/.changeset/new-glasses-march.md
@@ -0,0 +1,5 @@
+---
+"@solidjs/start": patch
+---
+
+fix #1550, add "X-Content-Raw" header
diff --git a/packages/start/src/runtime/server-handler.ts b/packages/start/src/runtime/server-handler.ts
@@ -2,16 +2,16 @@
 import { crossSerializeStream, fromJSON, getCrossReferenceHeader } from "seroval";
 // @ts-ignore
 import {
-  CustomEventPlugin,
-  DOMExceptionPlugin,
-  EventPlugin,
-  FormDataPlugin,
-  HeadersPlugin,
-  ReadableStreamPlugin,
-  RequestPlugin,
-  ResponsePlugin,
-  URLPlugin,
-  URLSearchParamsPlugin
+	CustomEventPlugin,
+	DOMExceptionPlugin,
+	EventPlugin,
+	FormDataPlugin,
+	HeadersPlugin,
+	ReadableStreamPlugin,
+	RequestPlugin,
+	ResponsePlugin,
+	URLPlugin,
+	URLSearchParamsPlugin
 } from "seroval-plugins/web";
 import { sharedConfig } from "solid-js";
 import { renderToString } from "solid-js/web";
@@ -167,15 +167,18 @@ async function handleServerFunction(h3Event: HTTPEvent) {
     }
 
     // handle responses
-    if (result instanceof Response && instance) {
-      // forward headers
-      if (result.headers) mergeResponseHeaders(h3Event, result.headers);
-      // forward non-redirect statuses
-      if (result.status && (result.status < 300 || result.status >= 400))
-        setResponseStatus(h3Event, result.status);
-      if ((result as any).customBody) {
-        result = await (result as any).customBody();
-      } else if (result.body == undefined) result = null;
+    if (result instanceof Response) {
+      if (result.headers && result.headers.has("X-Content-Raw")) return result;
+      if (instance) {
+        // forward headers
+        if (result.headers) mergeResponseHeaders(h3Event, result.headers);
+        // forward non-redirect statuses
+        if (result.status && (result.status < 300 || result.status >= 400))
+          setResponseStatus(h3Event, result.status);
+        if ((result as any).customBody) {
+          result = await (result as any).customBody();
+        } else if (result.body == undefined) result = null;
+      }
     }
 
     // handle no JS success case

diff --git a/packages/start/src/shared/GET.ts b/packages/start/src/shared/GET.ts
@@ -1,9 +1,8 @@
+// @refresh skip
 /**
  *
  * Read more: https://docs.solidjs.com/solid-start/reference/server/get
  */
 export function GET<T extends (...args: any[]) => any>(fn: T) {
-  return (...args: Parameters<T>) => {
-    return (fn as any).GET(...args) as ReturnType<T>;
-  };
+  return (fn as any).GET as (...args: Parameters<T>) => ReturnType<T>
 }