@solidjs/start 1.0.10 → 1.0.11

package/dist/runtime/server-handler.js

@@ -5,7 +5,7 @@ import { CustomEventPlugin, DOMExceptionPlugin, EventPlugin, FormDataPlugin, Hea
 import { sharedConfig } from "solid-js";
 import { renderToString } from "solid-js/web";
 import { provideRequestEvent } from "solid-js/web/storage";
-import { eventHandler, setHeader, setResponseStatus } from "vinxi/http";
+import { eventHandler, parseCookies, setHeader, setResponseStatus } from "vinxi/http";
 import invariant from "vinxi/lib/invariant";
 import { cloneEvent, getFetchEvent, mergeResponseHeaders } from "../server/fetchEvent";
 import { getExpectedRedirectStatus } from "../server/handler";
@@ -100,12 +100,13 @@ async function handleServerFunction(h3Event) {
         // This should never be the case in "proper" Nitro presets since node.req has to be IncomingMessage,
         // But the new azure-functions preset for some reason uses a ReadableStream in node.req (#1521)
         const isReadableStream = h3Request instanceof ReadableStream;
-        const isH3EventBodyStreamLocked = isReadableStream && h3Request.locked;
+        const hasReadableStream = h3Request.body instanceof ReadableStream;
+        const isH3EventBodyStreamLocked = (isReadableStream && h3Request.locked) || (hasReadableStream && h3Request.body.locked);
         const requestBody = isReadableStream ? h3Request : h3Request.body;
         if (contentType?.startsWith("multipart/form-data") ||
             contentType?.startsWith("application/x-www-form-urlencoded")) {
             // workaround for https://github.com/unjs/nitro/issues/1721
-            // (issue only in edge runtimes)
+            // (issue only in edge runtimes and netlify preset)
             parsed.push(await (isH3EventBodyStreamLocked
                 ? request
                 : new Request(request, { ...request, body: requestBody })).formData());
@@ -114,7 +115,7 @@ async function handleServerFunction(h3Event) {
         }
         else if (contentType?.startsWith("application/json")) {
             // workaround for https://github.com/unjs/nitro/issues/1721
-            // (issue only in edge runtimes)
+            // (issue only in edge runtimes and netlify preset)
             const tmpReq = isH3EventBodyStreamLocked
                 ? request
                 : new Request(request, { ...request, body: requestBody });
@@ -233,6 +234,32 @@ function handleNoJS(result, request, parsed, thrown) {
     });
 }
 let App;
+function createSingleFlightHeaders(sourceEvent) {
+    // cookie handling logic is pretty simplistic so this might be imperfect
+    // unclear if h3 internals are available on all platforms but we need a way to
+    // update request headers on the underlying H3 event.
+    const headers = new Headers(sourceEvent.request.headers);
+    const cookies = parseCookies(sourceEvent.nativeEvent);
+    const SetCookies = sourceEvent.response.headers.getSetCookie();
+    headers.delete("cookie");
+    let useH3Internals = false;
+    if (sourceEvent.nativeEvent.node?.req) {
+        useH3Internals = true;
+        sourceEvent.nativeEvent.node.req.headers.cookie = "";
+    }
+    SetCookies.forEach((cookie) => {
+        if (!cookie)
+            return;
+        const keyValue = cookie.split(";")[0];
+        const [key, value] = keyValue.split("=");
+        key && value && (cookies[key] = value);
+    });
+    Object.entries(cookies).forEach(([key, value]) => {
+        headers.append("cookie", `${key}=${value}`);
+        useH3Internals && (sourceEvent.nativeEvent.node.req.headers.cookie += `${key}=${value};`);
+    });
+    return headers;
+}
 async function handleSingleFlight(sourceEvent, result) {
     let revalidate;
     let url = new URL(sourceEvent.request.headers.get("referer")).toString();
@@ -243,7 +270,7 @@ async function handleSingleFlight(sourceEvent, result) {
             url = new URL(result.headers.get("Location"), new URL(sourceEvent.request.url).origin + import.meta.env.SERVER_BASE_URL).toString();
     }
     const event = cloneEvent(sourceEvent);
-    event.request = new Request(url, { headers: sourceEvent.request.headers });
+    event.request = new Request(url, { headers: createSingleFlightHeaders(sourceEvent) });
     return await provideRequestEvent(event, async () => {
         await createPageEvent(event);
         /* @ts-ignore */

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@solidjs/start",
-  "version": "1.0.10",
+  "version": "1.0.11",
   "type": "module",
   "author": "Ryan Carniato",
   "license": "MIT",
@@ -73,7 +73,7 @@
     "source-map-js": "^1.0.2",
     "terracotta": "^1.0.4",
     "tinyglobby": "^0.2.2",
-    "vite-plugin-solid": "^2.10.2"
+    "vite-plugin-solid": "^2.11.0"
   },
   "scripts": {
     "typecheck": "tsc --noEmit",