@solidjs/start 1.0.1 → 1.0.3

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/config/index.js

@@ -252,6 +252,7 @@ export function defineConfig(baseConfig = {}) {
                 fileURLToPath(new URL("../dist/runtime/server-fns-runtime.js", import.meta.url))
               )
             }),
+            start.experimental.islands ? serverComponents.server() : null,
             solid({ ...start.solid, ssr: true, extensions: extensions.map(ext => `.${ext}`) }),
             config("app-server", {
               resolve: {

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-fns-runtime.js

@@ -12,6 +12,7 @@ export function createServerReference(fn, id, name) {
             }
             if (prop === "GET")
                 return receiver;
+            return target[prop];
         },
         apply(target, thisArg, args) {
             const ogEvt = getRequestEvent();

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;
@@ -96,18 +96,24 @@ async function handleServerFunction(h3Event) {
     }
     if (h3Event.method === "POST") {
         const contentType = request.headers.get("content-type");
+        const h3EventBody = h3Event.node.req;
+        const isH3EventBodyStreamLocked = h3EventBody instanceof ReadableStream && h3EventBody.locked;
         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)
-            parsed.push(await new Request(request, { ...request, body: h3Event.node.req.body }).formData());
+            parsed.push(await (isH3EventBodyStreamLocked
+                ? request
+                : new Request(request, { ...request, body: h3EventBody })).formData());
             // what should work when #1721 is fixed
             // parsed.push(await request.formData);
         }
         else if (contentType?.startsWith("application/json")) {
             // workaround for https://github.com/unjs/nitro/issues/1721
             // (issue only in edge runtimes)
-            const tmpReq = new Request(request, { ...request, body: h3Event.node.req.body });
+            const tmpReq = isH3EventBodyStreamLocked
+                ? request
+                : new Request(request, { ...request, body: h3EventBody });
             // what should work when #1721 is fixed
             // just use request.json() here
             parsed = fromJSON(await tmpReq.json(), {
@@ -139,45 +145,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 +184,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 +200,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/runtime/server-runtime.js

@@ -119,11 +119,17 @@ async function fetchServerFunction(base, id, options, args) {
         ? createRequest(base, id, instance, options)
         : args.length === 1 && args[0] instanceof FormData
             ? createRequest(base, id, instance, { ...options, body: args[0] })
-            : createRequest(base, id, instance, {
-                ...options,
-                body: JSON.stringify(await Promise.resolve(toJSONAsync(args, { plugins }))),
-                headers: { ...options.headers, "Content-Type": "application/json" }
-            }));
+            : args.length === 1 && args[0] instanceof URLSearchParams
+                ? createRequest(base, id, instance, {
+                    ...options,
+                    body: args[0],
+                    headers: { ...options.headers, "Content-Type": "application/x-www-form-urlencoded" }
+                })
+                : createRequest(base, id, instance, {
+                    ...options,
+                    body: JSON.stringify(await Promise.resolve(toJSONAsync(args, { plugins }))),
+                    headers: { ...options.headers, "Content-Type": "application/json" }
+                }));
     if (response.headers.get("Location") ||
         response.headers.get("X-Revalidate") ||
         response.headers.get("X-Single-Flight")) {
@@ -167,13 +173,17 @@ export function createServerReference(fn, id, name) {
                     const fn = async (...args) => {
                         const encodeArgs = options.method && options.method.toUpperCase() === "GET";
                         return fetchServerFunction(encodeArgs
-                            ? url + (args.length ? `&args=${encodeURIComponent(JSON.stringify(await Promise.resolve(toJSONAsync(args, { plugins }))))}` : "")
+                            ? url +
+                                (args.length
+                                    ? `&args=${encodeURIComponent(JSON.stringify(await Promise.resolve(toJSONAsync(args, { plugins }))))}`
+                                    : "")
                             : `${baseURL}/_server`, `${id}#${name}`, options, encodeArgs ? [] : args);
                     };
                     fn.url = url;
                     return fn;
                 };
             }
+            return target[prop];
         },
         apply(target, thisArg, args) {
             return fetchServerFunction(`${baseURL}/_server`, `${id}#${name}`, {}, args);

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.3",
   "type": "module",
   "author": "Ryan Carniato",
   "license": "MIT",
@@ -55,14 +55,14 @@
     }
   },
   "devDependencies": {
-    "solid-js": "^1.8.17",
-    "vinxi": "^0.3.11",
+    "solid-js": "^1.8.18",
+    "vinxi": "^0.3.14",
     "typescript": "^5.4.2"
   },
   "dependencies": {
     "@vinxi/plugin-directives": "^0.3.1",
     "@vinxi/server-components": "^0.3.3",
-    "@vinxi/server-functions": "^0.3.2",
+    "@vinxi/server-functions": "^0.3.3",
     "defu": "^6.1.2",
     "error-stack-parser": "^2.1.4",
     "glob": "^10.3.10",