@solidjs/start 1.0.9 → 1.0.11

package/config/fs-router.js

@@ -58,7 +58,7 @@ export class SolidStartClientFileRouter extends BaseFileSystemRouter {
   }
 }
 
-const HTTP_METHODS = ["GET", "POST", "PUT", "DELETE", "PATCH"];
+const HTTP_METHODS = ["HEAD", "GET", "POST", "PUT", "DELETE", "PATCH"];
 function createHTTPHandlers(src, exports) {
   const handlers = {};
   for (const exp of exports) {
@@ -67,8 +67,15 @@ function createHTTPHandlers(src, exports) {
         src: src,
         pick: [exp.n]
       };
+      if (exp.n === "GET" && !exports.find(exp => exp.n === "HEAD")) {
+        handlers.$HEAD = {
+          src: src,
+          pick: [exp.n]
+        };
+      }
     }
   }
+
   return handlers;
 }
 

package/dist/middleware/index.d.ts

@@ -12,7 +12,7 @@ export declare function createMiddleware({ onRequest, onBeforeResponse }: {
     onRequest?: RequestMiddleware | RequestMiddleware[] | undefined;
     onBeforeResponse?: ResponseMiddleware | ResponseMiddleware[] | undefined;
 }): {
-    onRequest?: import("h3")._RequestMiddleware<import("h3").EventHandlerRequest> | import("h3")._RequestMiddleware<import("h3").EventHandlerRequest>[] | undefined;
-    onBeforeResponse?: import("h3")._ResponseMiddleware<import("h3").EventHandlerRequest, any> | import("h3")._ResponseMiddleware<import("h3").EventHandlerRequest, any>[] | undefined;
+    onRequest?: import("h3")._RequestMiddleware | import("h3")._RequestMiddleware[] | undefined;
+    onBeforeResponse?: import("h3")._ResponseMiddleware | import("h3")._ResponseMiddleware[] | undefined;
 };
 export {};

package/dist/router/routes.d.ts

@@ -4,6 +4,7 @@ interface Route {
     children?: Route[];
     page?: boolean;
     $component?: any;
+    $HEAD?: any;
     $GET?: any;
     $POST?: any;
     $PUT?: any;

package/dist/router/routes.js

@@ -22,7 +22,7 @@ function defineRoutes(fileRoutes) {
 export function matchAPIRoute(path, method) {
     const match = router.lookup(path);
     if (match && match.route) {
-        const handler = match.route[`$${method}`];
+        const handler = method === "HEAD" ? match.route["$HEAD"] || match.route["$GET"] : match.route[`$${method}`];
         if (handler === undefined)
             return;
         return {
@@ -32,7 +32,7 @@ export function matchAPIRoute(path, method) {
     }
 }
 function containsHTTP(route) {
-    return route["$GET"] || route["$POST"] || route["$PUT"] || route["$PATCH"] || route["$DELETE"];
+    return route["$HEAD"] || route["$GET"] || route["$POST"] || route["$PUT"] || route["$PATCH"] || route["$DELETE"];
 }
 const router = createRouter({
     routes: fileRoutes.reduce((memo, route) => {

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 });
@@ -207,31 +208,58 @@ async function handleServerFunction(h3Event) {
 function handleNoJS(result, request, parsed, thrown) {
     const url = new URL(request.url);
     const isError = result instanceof Error;
-    let redirectUrl = new URL(request.headers.get("referer")).toString();
     let statusCode = 302;
-    if (result instanceof Response && result.headers.has("Location")) {
-        redirectUrl = new URL(result.headers.get("Location"), url.origin + import.meta.env.SERVER_BASE_URL).toString();
-        statusCode = getExpectedRedirectStatus(result);
+    let headers;
+    if (result instanceof Response) {
+        headers = new Headers(result.headers);
+        if (result.headers.has("Location")) {
+            headers.set(`Location`, new URL(result.headers.get("Location"), url.origin + import.meta.env.SERVER_BASE_URL).toString());
+            statusCode = getExpectedRedirectStatus(result);
+        }
+    }
+    else
+        headers = new Headers({ Location: new URL(request.headers.get("referer")).toString() });
+    if (result) {
+        headers.append("Set-Cookie", `flash=${encodeURIComponent(JSON.stringify({
+            url: url.pathname + url.search,
+            result: isError ? result.message : result,
+            thrown: thrown,
+            error: isError,
+            input: [...parsed.slice(0, -1), [...parsed[parsed.length - 1].entries()]]
+        }))}; Secure; HttpOnly;`);
     }
     return new Response(null, {
         status: statusCode,
-        headers: {
-            Location: redirectUrl,
-            ...(result
-                ? {
-                    "Set-Cookie": `flash=${JSON.stringify({
-                        url: url.pathname + encodeURIComponent(url.search),
-                        result: isError ? result.message : result,
-                        thrown: thrown,
-                        error: isError,
-                        input: [...parsed.slice(0, -1), [...parsed[parsed.length - 1].entries()]]
-                    })}; Secure; HttpOnly;`
-                }
-                : {})
-        }
+        headers
     });
 }
 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();
@@ -242,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);
+    event.request = new Request(url, { headers: createSingleFlightHeaders(sourceEvent) });
     return await provideRequestEvent(event, async () => {
         await createPageEvent(event);
         /* @ts-ignore */

package/dist/server/handler.js

@@ -26,7 +26,7 @@ export function createBaseHandler(fn, createPageEvent, options = {}) {
                 const match = matchAPIRoute(new URL(event.request.url).pathname, event.request.method);
                 if (match) {
                     const mod = await match.handler.import();
-                    const fn = mod[event.request.method];
+                    const fn = event.request.method === "HEAD" ? mod["HEAD"] || mod["GET"] : mod[event.request.method];
                     event.params = match.params || {};
                     // @ts-ignore
                     sharedConfig.context = { event };

package/dist/server/pageEvent.js

@@ -4,19 +4,26 @@ function initFromFlash(ctx) {
     const flash = getCookie(ctx.nativeEvent, "flash");
     if (!flash)
         return;
-    let param = JSON.parse(flash);
-    if (!param || !param.result)
-        return;
-    const input = [...param.input.slice(0, -1), new Map(param.input[param.input.length - 1])];
-    setCookie(ctx.nativeEvent, "flash", "", { maxAge: 0 });
-    const result = param.error ? new Error(param.result) : param.result;
-    return {
-        input,
-        url: param.url,
-        pending: false,
-        result: param.thrown ? undefined : result,
-        error: param.thrown ? result : undefined,
-    };
+    try {
+        let param = JSON.parse(flash);
+        if (!param || !param.result)
+            return;
+        const input = [...param.input.slice(0, -1), new Map(param.input[param.input.length - 1])];
+        const result = param.error ? new Error(param.result) : param.result;
+        return {
+            input,
+            url: param.url,
+            pending: false,
+            result: param.thrown ? undefined : result,
+            error: param.thrown ? result : undefined
+        };
+    }
+    catch (e) {
+        console.error(e);
+    }
+    finally {
+        setCookie(ctx.nativeEvent, "flash", "", { maxAge: 0 });
+    }
 }
 export async function createPageEvent(ctx) {
     const clientManifest = import.meta.env.MANIFEST["client"];
@@ -28,7 +35,9 @@ export async function createPageEvent(ctx) {
         manifest: await clientManifest.json(),
         assets: [
             ...(await clientManifest.inputs[clientManifest.handler].assets()),
-            ...(import.meta.env.DEV ? await clientManifest.inputs[import.meta.env.START_APP].assets() : []),
+            ...(import.meta.env.DEV
+                ? await clientManifest.inputs[import.meta.env.START_APP].assets()
+                : []),
             ...(import.meta.env.START_ISLANDS
                 ? (await serverManifest.inputs[serverManifest.handler].assets()).filter(s => s.attrs.rel !== "modulepreload")
                 : [])

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@solidjs/start",
-  "version": "1.0.9",
+  "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",