@solidjs/start 0.5.6 → 0.5.8

package/config/server-handler.ts

@@ -14,7 +14,7 @@ import {
   URLSearchParamsPlugin
 } from "seroval-plugins/web";
 import { sharedConfig } from "solid-js";
-import { renderToStream } from "solid-js/web";
+import { renderToString } from "solid-js/web";
 import { provideRequestEvent } from "solid-js/web/storage";
 import { eventHandler, setHeader, setResponseStatus, type H3Event } from "vinxi/http";
 import invariant from "vinxi/lib/invariant";
@@ -176,7 +176,7 @@ async function handleServerFunction(h3Event: H3Event) {
       // forward headers
       if (x.headers) mergeResponseHeaders(h3Event, x.headers);
       if ((x as any).customBody) {
-        x = await (x as any).customBody();
+        x = (x as any).customBody();
       } else if (x.body == undefined) x = null;
     }
     return x;
@@ -203,17 +203,16 @@ async function handleSingleFlight(sourceEvent: FetchEvent, result: any) {
     event.router.dataOnly = revalidate || true;
     /* @ts-ignore */
     event.router.previousUrl = sourceEvent.request.headers.get("referer");
-    (async () => {
-      try {
-        await renderToStream(() => {
-          /* @ts-ignore */
-          sharedConfig.context.event = event;
-          App();
-        });
-      } catch (e) {
-        console.log(e);
-      }
-    })();
+    try {
+      renderToString(() => {
+        /* @ts-ignore */
+        sharedConfig.context.event = event;
+        App();
+      });
+    } catch (e) {
+      console.log(e);
+    }
+
     /* @ts-ignore */
     const body = event.router.data;
     if (!body) return result;
@@ -226,6 +225,8 @@ async function handleSingleFlight(sourceEvent: FetchEvent, result: any) {
     if (!(result instanceof Response)) {
       body["_$value"] = result;
       result = new Response(null, { status: 200 });
+    } else if ((result as any).customBody) {
+      body["_$value"] = (result as any).customBody();
     }
     result.customBody = () => body;
     result.headers.set("X-Single-Flight", "true");

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@solidjs/start",
-  "version": "0.5.6",
+  "version": "0.5.8",
   "type": "module",
   "author": "Ryan Carniato",
   "publishConfig": {
@@ -42,7 +42,7 @@
     }
   },
   "devDependencies": {
-    "solid-js": "^1.8.14",
+    "solid-js": "^1.8.15",
     "vinxi": "^0.2.1"
   },
   "dependencies": {
@@ -59,7 +59,7 @@
     "source-map-js": "^1.0.2",
     "terracotta": "^1.0.4",
     "vite-plugin-inspect": "^0.7.33",
-    "vite-plugin-solid": "^2.9.1"
+    "vite-plugin-solid": "~2.9.1"
   },
   "scripts": {
     "typecheck": "tsc --noEmit --checkJs false --skipLibCheck"

package/server/fetchEvent.ts

@@ -8,20 +8,19 @@ import {
   getResponseHeaders,
   getResponseStatus,
   getResponseStatusText,
+  getWebRequest,
   removeResponseHeader,
   setHeader,
   setResponseHeader,
   setResponseStatus,
-  toWebRequest
 } from "vinxi/http";
 import type { FetchEvent, ResponseStub } from "./types";
 
 const fetchEventSymbol = Symbol("fetchEvent");
 
 export function createFetchEvent(event: H3Event): FetchEvent {
-  const request = toWebRequest(event);
   return {
-    request: request,
+    request: getWebRequest(event),
     response: createResponseStub(event),
     clientAddress: getRequestIP(event),
     locals: {},