@solidjs/start 1.0.8 → 1.0.10

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

@@ -207,28 +207,29 @@ 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;
@@ -242,7 +243,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: sourceEvent.request.headers });
     return await provideRequestEvent(event, async () => {
         await createPageEvent(event);
         /* @ts-ignore */

package/dist/runtime/server-runtime.js

@@ -130,9 +130,9 @@ async function fetchServerFunction(base, id, options, args) {
                     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")) {
+    if (response.headers.has("Location") ||
+        response.headers.has("X-Revalidate") ||
+        response.headers.has("X-Single-Flight")) {
         if (response.body) {
             /* @ts-ignore-next-line */
             response.customBody = () => {

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/dist/shared/clientOnly.d.ts

@@ -5,6 +5,8 @@ import type { Component, ComponentProps, JSX } from "solid-js";
  */
 export default function clientOnly<T extends Component<any>>(fn: () => Promise<{
     default: T;
-}>): (props: ComponentProps<T> & {
+}>, options?: {
+    lazy?: boolean;
+}): (props: ComponentProps<T> & {
     fallback?: JSX.Element;
 }) => any;

package/dist/shared/clientOnly.jsx

@@ -5,15 +5,16 @@ import { isServer } from "solid-js/web";
  * Read more: https://docs.solidjs.com/solid-start/reference/client/client-only
  */
 // not using Suspense
-export default function clientOnly(fn) {
+export default function clientOnly(fn, options = {}) {
     if (isServer)
         return (props) => props.fallback;
     const [comp, setComp] = createSignal();
-    fn().then(m => setComp(() => m.default));
+    !options.lazy && load(fn, setComp);
     return (props) => {
         let Comp;
         let m;
         const [, rest] = splitProps(props, ["fallback"]);
+        options.lazy && load(fn, setComp);
         if ((Comp = comp()) && !sharedConfig.context)
             return Comp(rest);
         const [mounted, setMounted] = createSignal(!sharedConfig.context);
@@ -21,3 +22,6 @@ export default function clientOnly(fn) {
         return createMemo(() => ((Comp = comp()), (m = mounted()), untrack(() => (Comp && m ? Comp(rest) : props.fallback))));
     };
 }
+function load(fn, setComp) {
+    fn().then(m => setComp(() => m.default));
+}

package/dist/shared/dev-overlay/DevOverlayDialog.jsx

@@ -14,12 +14,20 @@ export function classNames(...classes) {
     return classes.filter(Boolean).join(' ');
 }
 function ErrorInfo(props) {
-    return (<Show when={props.error instanceof Error && props.error} keyed fallback={<span>{props.error.toString()}</span>}>
-      {(current) => (<span class="dev-overlay-error-info">
-          <span class="dev-overlay-error-info-name">{current.name}</span>
-          <span class="dev-overlay-error-info-message">{current.message}</span>
-        </span>)}
-    </Show>);
+    const error = createMemo(() => {
+        const e = props.error;
+        if (e instanceof Error) {
+            return { name: e.name, message: e.message };
+        }
+        if (e instanceof ErrorEvent) {
+            return { message: e.message };
+        }
+        return { message: e.toString() };
+    });
+    return (<span class="dev-overlay-error-info">
+      <span class="dev-overlay-error-info-name">{error().name}</span>
+      <span class="dev-overlay-error-info-message">{error().message}</span>
+    </span>);
 }
 function getFileName(source) {
     try {

package/dist/shared/dev-overlay/index.jsx

@@ -7,7 +7,7 @@ const DevOverlayDialog =
     ? () => {
         return <></>;
     }
-    : /* #__PURE__ */ clientOnly(() => import("./DevOverlayDialog"));
+    : /* #__PURE__ */ clientOnly(() => import("./DevOverlayDialog"), { lazy: true });
 export function DevOverlay(props) {
     const [errors, setErrors] = createSignal([]);
     function resetError() {
@@ -20,7 +20,7 @@ export function DevOverlay(props) {
     }
     createEffect(() => {
         const onErrorEvent = (error) => {
-            pushError(error.error);
+            pushError(error.error ?? error);
         };
         window.addEventListener("error", onErrorEvent);
         onCleanup(() => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@solidjs/start",
-  "version": "1.0.8",
+  "version": "1.0.10",
   "type": "module",
   "author": "Ryan Carniato",
   "license": "MIT",
@@ -55,7 +55,7 @@
     }
   },
   "devDependencies": {
-    "solid-js": "^1.9.1",
+    "solid-js": "^1.9.2",
     "vinxi": "^0.4.3",
     "typescript": "^5.4.2"
   },
@@ -65,7 +65,6 @@
     "@vinxi/server-functions": "^0.4.3",
     "defu": "^6.1.2",
     "error-stack-parser": "^2.1.4",
-    "glob": "^10.3.10",
     "html-to-image": "^1.11.11",
     "radix3": "^1.1.0",
     "seroval": "^1.0.2",
@@ -73,6 +72,7 @@
     "shikiji": "^0.9.12",
     "source-map-js": "^1.0.2",
     "terracotta": "^1.0.4",
+    "tinyglobby": "^0.2.2",
     "vite-plugin-solid": "^2.10.2"
   },
   "scripts": {