@solidjs/start 1.0.1 → 1.0.2

package/config/index.d.ts

@@ -3,9 +3,14 @@ import type { CustomizableConfig } from "vinxi/dist/types/lib/vite-dev";
 import { InlineConfig } from "vite";
 import type { Options } from "vite-plugin-solid";
 
-// atleast until we sort which server options are good to use
+// should probably be maintained by Vinxi
+type VinxiViteServerOptions = Omit<
+  InlineConfig["server"],
+  "port" | "strictPort" | "host" | "middlewareMode" | "open"
+>;
+
 type ViteCustomizableConfig = CustomizableConfig & {
-  server?: InlineConfig["server"];
+  server?: VinxiViteServerOptions;
 };
 
 type SolidStartInlineConfig = {

package/dist/middleware/index.d.ts

@@ -2,7 +2,7 @@ import type { FetchEvent } from "../server/types";
 /** Function responsible for receiving an observable [operation]{@link Operation} and returning a [result]{@link OperationResult}. */
 export type MiddlewareFn = (event: FetchEvent) => Promise<unknown> | unknown;
 /** This composes an array of Exchanges into a single ExchangeIO function */
-export type RequestMiddleware = (event: FetchEvent) => Response | Promise<Response> | void | Promise<void>;
+export type RequestMiddleware = (event: FetchEvent) => Response | Promise<Response> | void | Promise<void> | Promise<void | Response>;
 type EventHandlerResponse<T = any> = T | Promise<T>;
 type ResponseMiddlewareResponseParam = {
     body?: Awaited<EventHandlerResponse>;

package/dist/runtime/server-handler.js

@@ -8,8 +8,8 @@ import { provideRequestEvent } from "solid-js/web/storage";
 import { eventHandler, setHeader, setResponseStatus } from "vinxi/http";
 import invariant from "vinxi/lib/invariant";
 import { cloneEvent, getFetchEvent, mergeResponseHeaders } from "../server/fetchEvent";
-import { createPageEvent } from "../server/pageEvent";
 import { getExpectedRedirectStatus } from "../server/handler";
+import { createPageEvent } from "../server/pageEvent";
 function createChunk(data) {
     const encodeData = new TextEncoder().encode(data);
     const bytes = encodeData.length;
@@ -139,45 +139,26 @@ async function handleServerFunction(h3Event) {
             result = await handleSingleFlight(event, result);
         }
         // 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.customBody) {
-                result = await result.customBody();
+        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.customBody) {
+                    result = await result.customBody();
+                }
+                else if (result.body == undefined)
+                    result = null;
             }
-            else if (result.body == undefined)
-                result = null;
         }
         // handle no JS success case
-        if (!instance) {
-            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"), new URL(request.url).origin + import.meta.env.SERVER_BASE_URL).toString();
-                statusCode = getExpectedRedirectStatus(result);
-            }
-            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,
-                                error: isError,
-                                input: [...parsed.slice(0, -1), [...parsed[parsed.length - 1].entries()]]
-                            })}; Secure; HttpOnly;`
-                        }
-                        : {})
-                }
-            });
-        }
+        if (!instance)
+            return handleNoJS(result, request, parsed);
         setHeader(h3Event, "content-type", "text/javascript");
         return serializeToStream(instance, result);
     }
@@ -197,10 +178,14 @@ async function handleServerFunction(h3Event) {
             }
             else if (x.body == undefined)
                 x = null;
+            setHeader(h3Event, "X-Error", "true");
         }
-        else {
+        else if (instance) {
             const error = x instanceof Error ? x.message : typeof x === "string" ? x : "true";
-            setHeader(h3Event, "X-Error", error);
+            setHeader(h3Event, "X-Error", error.replace(/[\r\n]+/g, ""));
+        }
+        else {
+            x = handleNoJS(x, request, parsed, true);
         }
         if (instance) {
             setHeader(h3Event, "content-type", "text/javascript");
@@ -209,6 +194,33 @@ async function handleServerFunction(h3Event) {
         return x;
     }
 }
+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);
+    }
+    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;`
+                }
+                : {})
+        }
+    });
+}
 let App;
 async function handleSingleFlight(sourceEvent, result) {
     let revalidate;

package/dist/server/fetchEvent.js

@@ -81,7 +81,7 @@ function createResponseStub(event) {
             return getResponseStatusText(event);
         },
         set statusText(v) {
-            setResponseStatus(event, getResponseStatus(), v);
+            setResponseStatus(event, getResponseStatus(event), v);
         },
         headers: new HeaderProxy(event)
     };

package/dist/server/pageEvent.js

@@ -9,11 +9,13 @@ function initFromFlash(ctx) {
         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.error ? new Error(param.result) : param.result,
+        result: param.thrown ? undefined : result,
+        error: param.thrown ? result : undefined,
     };
 }
 export async function createPageEvent(ctx) {

package/dist/server/renderAsset.jsx

@@ -5,7 +5,8 @@ const assetMap = {
         return props.attrs.src ? (<script {...props.attrs} id={props.key}>
         {" "}
       </script>) : null;
-    }
+    },
+    noscript: (props) => (<noscript {...props.attrs}>{props.children}</noscript>),
 };
 export function renderAsset(asset, nonce) {
     let { tag, attrs: { key, ...attrs } = { key: undefined }, children } = asset;

package/dist/shared/GET.js

@@ -1,9 +1,8 @@
+// @refresh skip
 /**
  *
  * Read more: https://docs.solidjs.com/solid-start/reference/server/get
  */
 export function GET(fn) {
-    return (...args) => {
-        return fn.GET(...args);
-    };
+    return fn.GET;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@solidjs/start",
-  "version": "1.0.1",
+  "version": "1.0.2",
   "type": "module",
   "author": "Ryan Carniato",
   "license": "MIT",
@@ -56,7 +56,7 @@
   },
   "devDependencies": {
     "solid-js": "^1.8.17",
-    "vinxi": "^0.3.11",
+    "vinxi": "^0.3.12",
     "typescript": "^5.4.2"
   },
   "dependencies": {