@solidjs/start 1.0.0-rc.1 → 1.0.1

package/config/fs-router.js

@@ -24,6 +24,7 @@ export class SolidStartClientFileRouter extends BaseFileSystemRouter {
 
     if (src.endsWith(".md") || src.endsWith(".mdx")) {
       return {
+        page: true,
         $component: {
           src: src,
           pick: ["$css"]
@@ -35,10 +36,11 @@ export class SolidStartClientFileRouter extends BaseFileSystemRouter {
     }
 
     const [_, exports] = analyzeModule(src);
-    const hasDefault = exports.find(e => e.n === "default");
-    const hasRouteConfig = exports.find(e => e.n === "route");
+    const hasDefault = !!exports.find(e => e.n === "default");
+    const hasRouteConfig = !!exports.find(e => e.n === "route");
     if (hasDefault) {
       return {
+        page: true,
         $component: {
           src: src,
           pick: ["default", "$css"]
@@ -93,6 +95,7 @@ export class SolidStartServerFileRouter extends BaseFileSystemRouter {
     let path = this.toPath(src);
     if (src.endsWith(".md") || src.endsWith(".mdx")) {
       return {
+        page: true,
         $component: {
           src: src,
           pick: ["$css"]
@@ -105,16 +108,18 @@ export class SolidStartServerFileRouter extends BaseFileSystemRouter {
 
     const [_, exports] = analyzeModule(src);
     const hasRouteConfig = exports.find(e => e.n === "route");
-    const hasDefault = exports.find(e => e.n === "default");
-    const hasAPIRoutes = exports.find(exp => HTTP_METHODS.includes(exp.n));
+    const hasDefault = !!exports.find(e => e.n === "default");
+    const hasAPIRoutes = !!exports.find(exp => HTTP_METHODS.includes(exp.n));
     if (hasDefault || hasAPIRoutes) {
       return {
-        $component: hasDefault
-          ? {
-              src: src,
-              pick: ["default", "$css"]
-            }
-          : undefined,
+        page: hasDefault,
+        $component:
+          !this.config.dataOnly && hasDefault
+            ? {
+                src: src,
+                pick: ["default", "$css"]
+              }
+            : undefined,
         $$route: hasRouteConfig
           ? {
               src: src,

package/config/index.d.ts

@@ -6,7 +6,7 @@ import type { Options } from "vite-plugin-solid";
 // atleast until we sort which server options are good to use
 type ViteCustomizableConfig = CustomizableConfig & {
   server?: InlineConfig["server"];
-}
+};
 
 type SolidStartInlineConfig = {
   ssr?: boolean;
@@ -16,13 +16,19 @@ type SolidStartInlineConfig = {
   appRoot?: string;
   routeDir?: string;
   middleware?: string;
-  devOverlay?:  boolean;
+  devOverlay?: boolean;
   experimental?: {
     islands?: boolean;
-  }
+  };
   vite?:
     | ViteCustomizableConfig
     | ((options: { router: "server" | "client" | "server-function" }) => ViteCustomizableConfig);
 };
 
-export declare function defineConfig(baseConfig?: SolidStartInlineConfig): ReturnType<typeof createApp>;
+/**
+ *
+ * Read more: https://docs.solidjs.com/solid-start/reference/entrypoints/app-config
+ */
+export declare function defineConfig(
+  baseConfig?: SolidStartInlineConfig
+): ReturnType<typeof createApp>;

package/config/index.js

@@ -30,7 +30,8 @@ function solidStartServerFsRouter(config) {
     new SolidStartServerFileRouter(
       {
         dir: resolve.absolute(config.dir, router.root),
-        extensions: config.extensions ?? DEFAULT_EXTENSIONS
+        extensions: config.extensions ?? DEFAULT_EXTENSIONS,
+        dataOnly: config.dataOnly
       },
       router,
       app
@@ -90,7 +91,7 @@ export function defineConfig(baseConfig = {}) {
         },
         handler: `${start.appRoot}/entry-server${entryExtension}`,
         middleware: start.middleware,
-        routes: solidStartServerFsRouter({ dir: routeDir, extensions }),
+        routes: solidStartServerFsRouter({ dir: routeDir, extensions, dataOnly: !start.ssr }),
         extensions,
         target: "server",
         plugins: async () => {
@@ -133,7 +134,9 @@ export function defineConfig(baseConfig = {}) {
               },
               cacheDir: "node_modules/.vinxi/server",
               define: {
-                "import.meta.env.START_APP": JSON.stringify(`${start.appRoot}/app${entryExtension}`),
+                "import.meta.env.START_APP": JSON.stringify(
+                  `${start.appRoot}/app${entryExtension}`
+                ),
                 "import.meta.env.START_ISLANDS": JSON.stringify(start.experimental.islands),
                 "import.meta.env.SSR": JSON.stringify(true),
                 "import.meta.env.START_SSR": JSON.stringify(start.ssr),
@@ -201,7 +204,9 @@ export function defineConfig(baseConfig = {}) {
               },
               cacheDir: "node_modules/.vinxi/client",
               define: {
-                "import.meta.env.START_APP": JSON.stringify(`${start.appRoot}/app${entryExtension}`),
+                "import.meta.env.START_APP": JSON.stringify(
+                  `${start.appRoot}/app${entryExtension}`
+                ),
                 "import.meta.env.START_ISLANDS": JSON.stringify(start.experimental.islands),
                 "import.meta.env.SSR": JSON.stringify(false),
                 "import.meta.env.START_SSR": JSON.stringify(start.ssr),
@@ -213,7 +218,6 @@ export function defineConfig(baseConfig = {}) {
           ];
         }
       },
-
       {
         name: "server-fns",
         type: "http",
@@ -223,7 +227,7 @@ export function defineConfig(baseConfig = {}) {
         ),
         middleware: start.middleware,
         target: "server",
-        routes: solidStartServerFsRouter({ dir: routeDir, extensions }),
+        routes: solidStartServerFsRouter({ dir: routeDir, extensions, dataOnly: !start.ssr }),
         plugins: async () => {
           const userConfig =
             typeof vite === "function" ? await vite({ router: "server-function" }) : { ...vite };
@@ -263,7 +267,9 @@ export function defineConfig(baseConfig = {}) {
                 }
               },
               define: {
-                "import.meta.env.START_APP": JSON.stringify(`${start.appRoot}/app${entryExtension}`),
+                "import.meta.env.START_APP": JSON.stringify(
+                  `${start.appRoot}/app${entryExtension}`
+                ),
                 "import.meta.env.START_ISLANDS": JSON.stringify(start.experimental.islands),
                 "import.meta.env.SSR": JSON.stringify(true),
                 "import.meta.env.START_SSR": JSON.stringify(start.ssr),

package/dist/client/StartClient.d.ts

@@ -1,3 +1,7 @@
 import type { JSX } from "solid-js";
 import "./mount";
+/**
+ *
+ * Read more: https://docs.solidjs.com/solid-start/reference/client/start-client
+ */
 export declare function StartClient(): JSX.Element;

package/dist/client/StartClient.jsx

@@ -6,6 +6,10 @@ import "./mount";
 function Dummy(props) {
     return props.children;
 }
+/**
+ *
+ * Read more: https://docs.solidjs.com/solid-start/reference/client/start-client
+ */
 export function StartClient() {
     return (<Dummy>
       <Dummy>

package/dist/client/islands.d.ts

@@ -1,3 +1,7 @@
 import "vinxi/client";
+/**
+ *
+ * Read more: https://docs.solidjs.com/solid-start/reference/client/start-client
+ */
 export declare function StartClient(): null;
 export { mount } from "./mount";

package/dist/client/islands.jsx

@@ -1,5 +1,9 @@
 // @refresh skip
 import "vinxi/client";
+/**
+ *
+ * Read more: https://docs.solidjs.com/solid-start/reference/client/start-client
+ */
 export function StartClient() {
     return null;
 }

package/dist/client/mount.d.ts

@@ -1,3 +1,7 @@
 import type { JSX } from "solid-js";
 import { type MountableElement } from "solid-js/web";
+/**
+ *
+ * Read more: https://docs.solidjs.com/solid-start/reference/client/mount
+ */
 export declare function mount(fn: () => JSX.Element, el: MountableElement): (() => void) | undefined;

package/dist/client/mount.js

@@ -1,5 +1,9 @@
 import { createStore } from "solid-js/store";
 import { createComponent, getHydrationKey, getOwner, hydrate } from "solid-js/web";
+/**
+ *
+ * Read more: https://docs.solidjs.com/solid-start/reference/client/mount
+ */
 export function mount(fn, el) {
     if (import.meta.env.START_ISLANDS) {
         const map = new WeakMap();
@@ -17,7 +21,8 @@ export function mount(fn, el) {
             }
             let mod = await import(
             /* @vite-ignore */
-            import.meta.env.MANIFEST["client"].chunks[el.dataset.id.split("#")[0]].output.path);
+            import.meta.env.MANIFEST["client"].chunks[el.dataset.id.split("#")[0]].output
+                .path);
             if (!mod || !el.dataset.hk)
                 return;
             let Component = mod[el.dataset.id.split("#")[1]];
@@ -58,7 +63,8 @@ export function mount(fn, el) {
             const islands = document.querySelectorAll("solid-island[data-hk]");
             const assets = new Set();
             islands.forEach((el) => el.dataset.id && assets.add(el.dataset.id));
-            Promise.all([...assets].map(asset => import(/* @vite-ignore */ import.meta.env.MANIFEST["client"].chunks[asset.split("#")[0]].output.path)))
+            Promise.all([...assets].map(asset => import(
+            /* @vite-ignore */ import.meta.env.MANIFEST["client"].chunks[asset.split("#")[0]].output.path)))
                 .then(() => {
                 islands.forEach((el) => {
                     if (el.dataset.when === "idle" && "requestIdleCallback" in window) {

package/dist/router/FileRoutes.d.ts

@@ -1,2 +1,6 @@
 export declare function createRoutes(): any[];
+/**
+ *
+ * Read more: https://docs.solidjs.com/solid-start/reference/routing/file-routes
+ */
 export declare const FileRoutes: () => any[];

package/dist/router/FileRoutes.js

@@ -10,9 +10,10 @@ export function createRoutes() {
                 ...(route.$$route ? route.$$route.require().route.info : {}),
                 filesystem: true
             },
-            component: lazyRoute(route.$component, import.meta.env.START_ISLANDS
-                ? import.meta.env.MANIFEST["ssr"]
-                : import.meta.env.MANIFEST["client"], import.meta.env.MANIFEST["ssr"]),
+            component: route.$component &&
+                lazyRoute(route.$component, import.meta.env.START_ISLANDS
+                    ? import.meta.env.MANIFEST["ssr"]
+                    : import.meta.env.MANIFEST["client"], import.meta.env.MANIFEST["ssr"]),
             children: route.children ? route.children.map(createRoute) : undefined
         };
     }
@@ -20,6 +21,10 @@ export function createRoutes() {
     return routes;
 }
 let routes;
+/**
+ *
+ * Read more: https://docs.solidjs.com/solid-start/reference/routing/file-routes
+ */
 export const FileRoutes = isServer
     ? () => getRequestEvent().routes
     : () => routes || (routes = createRoutes());

package/dist/router/lazyRoute.js

@@ -6,11 +6,16 @@ export default function lazyRoute(component, clientManifest, serverManifest, exp
     return lazy(async () => {
         if (import.meta.env.DEV) {
             let manifest = import.meta.env.SSR ? serverManifest : clientManifest;
-            const mod = await manifest.inputs[component.src].import();
+            // import() throws if a module doesn't exist, which includes any
+            // modules loaded by the route itself, so it's important we catch here
+            const mod = await manifest.inputs[component.src].import().catch(() => null);
+            // fallback to an empty component as any errors will surface in the vite overlay
+            if (!mod)
+                return { default: () => [] };
             if (!mod[exported])
                 console.error(`Module ${component.src} does not export ${exported}`);
             const Component = mod[exported];
-            let assets = await clientManifest.inputs?.[component.src].assets();
+            let assets = await clientManifest.inputs?.[component.src]?.assets();
             const styles = assets.filter((asset) => asset.tag === "style");
             if (typeof window !== "undefined" && import.meta.hot) {
                 import.meta.hot.on("css-update", data => {

package/dist/router/routes.d.ts

@@ -2,6 +2,7 @@ interface Route {
     path: string;
     id: string;
     children?: Route[];
+    page?: boolean;
     $component?: any;
     $GET?: any;
     $POST?: any;

package/dist/router/routes.js

@@ -1,6 +1,6 @@
 import { createRouter } from "radix3";
 import fileRoutes from "vinxi/routes";
-export const pageRoutes = defineRoutes(fileRoutes.filter(o => o.$component));
+export const pageRoutes = defineRoutes(fileRoutes.filter(o => o.page));
 function defineRoutes(fileRoutes) {
     function processRoute(routes, route, id, full) {
         const parentRoute = Object.values(routes).find(o => {
@@ -21,7 +21,7 @@ function defineRoutes(fileRoutes) {
 }
 export function matchAPIRoute(path, method) {
     const match = router.lookup(path);
-    if (match) {
+    if (match && match.route) {
         const handler = match.route[`$${method}`];
         if (handler === undefined)
             return;

package/dist/runtime/server-handler.js

@@ -9,6 +9,7 @@ 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";
 function createChunk(data) {
     const encodeData = new TextEncoder().encode(data);
     const bytes = encodeData.length;
@@ -155,11 +156,13 @@ async function handleServerFunction(h3Event) {
         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: 302,
+                status: statusCode,
                 headers: {
                     Location: redirectUrl,
                     ...(result

package/dist/server/StartServer.d.ts

@@ -1,5 +1,9 @@
 import type { Component, JSX } from "solid-js";
 import type { DocumentComponentProps } from "./types";
+/**
+ *
+ * Read more: https://docs.solidjs.com/solid-start/reference/server/start-server
+ */
 export declare function StartServer(props: {
     document: Component<DocumentComponentProps>;
 }): JSX.Element;

package/dist/server/StartServer.jsx

@@ -2,7 +2,7 @@
 // @ts-ignore
 import App from "#start/app";
 import { Hydration, HydrationScript, NoHydration, getRequestEvent, ssr, useAssets } from "solid-js/web";
-import { ErrorBoundary } from "../shared/ErrorBoundary";
+import { ErrorBoundary, TopErrorBoundary } from "../shared/ErrorBoundary";
 import { renderAsset } from "./renderAsset";
 const docType = ssr("<!DOCTYPE html>");
 function matchRoute(matches, routes, matched = []) {
@@ -22,12 +22,17 @@ function matchRoute(matches, routes, matched = []) {
         return next;
     }
 }
+/**
+ *
+ * Read more: https://docs.solidjs.com/solid-start/reference/server/start-server
+ */
 export function StartServer(props) {
     const context = getRequestEvent();
     // @ts-ignore
     const nonce = context.nonce;
     let assets = [];
     Promise.resolve().then(async () => {
+        let assetPromises = [];
         // @ts-ignore
         if (context.router && context.router.matches) {
             // @ts-ignore
@@ -40,39 +45,41 @@ export function StartServer(props) {
                     const segment = matched[i];
                     const part = import.meta.env.MANIFEST[import.meta.env.START_ISLANDS ? "ssr" : "client"]
                         .inputs[segment["$component"].src];
-                    const asset = (await part.assets());
-                    assets.push.apply(assets, asset);
+                    assetPromises.push(part.assets());
                 }
             }
-            else
+            else if (import.meta.env.DEV)
                 console.warn("No route matched for preloading js assets");
         }
+        assets = await Promise.all(assetPromises).then(a => 
         // dedupe assets
-        assets = [...new Map(assets.map(item => [item.attrs.key, item])).values()].filter(asset => import.meta.env.START_ISLANDS
+        [...new Map(a.flat().map(item => [item.attrs.key, item])).values()].filter(asset => import.meta.env.START_ISLANDS
             ? false
             : asset.attrs.rel === "modulepreload" &&
-                !context.assets.find((a) => a.attrs.key === asset.attrs.key));
+                !context.assets.find((a) => a.attrs.key === asset.attrs.key)));
     });
     useAssets(() => (assets.length ? assets.map(m => renderAsset(m)) : undefined));
     return (<NoHydration>
       {docType}
-      <props.document assets={<>
-            <HydrationScript />
-            {context.assets.map((m) => renderAsset(m, nonce))}
-          </>} scripts={nonce ? (<>
-              <script nonce={nonce} innerHTML={`window.manifest = ${JSON.stringify(context.manifest)}`}/>
-              <script type="module" nonce={nonce} async src={import.meta.env.MANIFEST["client"].inputs[import.meta.env.MANIFEST["client"].handler].output.path}/>
-            </>) : (<>
-              <script innerHTML={`window.manifest = ${JSON.stringify(context.manifest)}`}/>
-              <script type="module" async src={import.meta.env.MANIFEST["client"].inputs[import.meta.env.MANIFEST["client"].handler].output.path}/>
-            </>)}>
-        {!import.meta.env.START_ISLANDS ? (<Hydration>
-            <ErrorBoundary>
+      <TopErrorBoundary>
+        <props.document assets={<>
+              <HydrationScript />
+              {context.assets.map((m) => renderAsset(m, nonce))}
+            </>} scripts={nonce ? (<>
+                <script nonce={nonce} innerHTML={`window.manifest = ${JSON.stringify(context.manifest)}`}/>
+                <script type="module" nonce={nonce} async src={import.meta.env.MANIFEST["client"].inputs[import.meta.env.MANIFEST["client"].handler].output.path}/>
+              </>) : (<>
+                <script innerHTML={`window.manifest = ${JSON.stringify(context.manifest)}`}/>
+                <script type="module" async src={import.meta.env.MANIFEST["client"].inputs[import.meta.env.MANIFEST["client"].handler].output.path}/>
+              </>)}>
+          {!import.meta.env.START_ISLANDS ? (<Hydration>
+              <ErrorBoundary>
+                <App />
+              </ErrorBoundary>
+            </Hydration>) : (<ErrorBoundary>
               <App />
-            </ErrorBoundary>
-          </Hydration>) : (<ErrorBoundary>
-            <App />
-          </ErrorBoundary>)}
-      </props.document>
+            </ErrorBoundary>)}
+        </props.document>
+      </TopErrorBoundary>
     </NoHydration>);
 }

package/dist/server/handler.d.ts

@@ -1,3 +1,12 @@
-import type { FetchEvent, HandlerOptions, PageEvent } from "./types";
+import type { FetchEvent, HandlerOptions, PageEvent, ResponseStub } from "./types";
+/**
+ * Checks if user has set a redirect status in the response.
+ * If not, falls back to the 302 (temporary redirect)
+ */
+export declare function getExpectedRedirectStatus(response: ResponseStub): number;
 export declare function createBaseHandler(fn: (context: PageEvent) => unknown, createPageEvent: (event: FetchEvent) => Promise<PageEvent>, options?: HandlerOptions | ((context: PageEvent) => HandlerOptions | Promise<HandlerOptions>)): import("h3").EventHandler<import("h3").EventHandlerRequest, Promise<any>>;
+/**
+ *
+ * Read more: https://docs.solidjs.com/solid-start/reference/server/create-handler
+ */
 export declare function createHandler(fn: (context: PageEvent) => unknown, options?: HandlerOptions | ((context: PageEvent) => HandlerOptions | Promise<HandlerOptions>)): import("h3").EventHandler<import("h3").EventHandlerRequest, Promise<any>>;

package/dist/server/handler.js

@@ -5,6 +5,18 @@ import { eventHandler, sendRedirect, setHeader, setResponseStatus } from "vinxi/
 import { matchAPIRoute } from "../router/routes";
 import { getFetchEvent } from "./fetchEvent";
 import { createPageEvent } from "./pageEvent";
+// according to https://developer.mozilla.org/en-US/docs/Web/HTTP/Status#redirection_messages
+const validRedirectStatuses = new Set([301, 302, 303, 307, 308]);
+/**
+ * Checks if user has set a redirect status in the response.
+ * If not, falls back to the 302 (temporary redirect)
+ */
+export function getExpectedRedirectStatus(response) {
+    if (response.status && validRedirectStatuses.has(response.status)) {
+        return response.status;
+    }
+    return 302;
+}
 export function createBaseHandler(fn, createPageEvent, options = {}) {
     return eventHandler({
         handler: (e) => {
@@ -39,7 +51,8 @@ export function createBaseHandler(fn, createPageEvent, options = {}) {
                     }, resolvedOptions);
                     context.complete = true;
                     if (context.response && context.response.headers.get("Location")) {
-                        return sendRedirect(e, context.response.headers.get("Location"));
+                        const status = getExpectedRedirectStatus(context.response);
+                        return sendRedirect(e, context.response.headers.get("Location"), status);
                     }
                     return html;
                 }
@@ -66,7 +79,8 @@ export function createBaseHandler(fn, createPageEvent, options = {}) {
                     return fn(context);
                 }, resolvedOptions);
                 if (context.response && context.response.headers.get("Location")) {
-                    return sendRedirect(e, context.response.headers.get("Location"));
+                    const status = getExpectedRedirectStatus(context.response);
+                    return sendRedirect(e, context.response.headers.get("Location"), status);
                 }
                 if (mode === "async")
                     return stream;
@@ -81,7 +95,8 @@ export function createBaseHandler(fn, createPageEvent, options = {}) {
 function handleShellCompleteRedirect(context, e) {
     return () => {
         if (context.response && context.response.headers.get("Location")) {
-            setResponseStatus(e, 302);
+            const status = getExpectedRedirectStatus(context.response);
+            setResponseStatus(e, status);
             setHeader(e, "Location", context.response.headers.get("Location"));
         }
     };
@@ -93,6 +108,10 @@ function handleStreamCompleteRedirect(context) {
         to && write(`<script>window.location="${to}"</script>`);
     };
 }
+/**
+ *
+ * Read more: https://docs.solidjs.com/solid-start/reference/server/create-handler
+ */
 export function createHandler(fn, options) {
     return createBaseHandler(fn, createPageEvent, options);
 }

package/dist/server/serverFunction.d.ts

@@ -1,2 +1,6 @@
 import type { ServerFunctionMeta } from "./types";
+/**
+ *
+ * Read more: https://docs.solidjs.com/solid-start/reference/server/get-server-function-meta
+ */
 export declare function getServerFunctionMeta(): ServerFunctionMeta | undefined;

package/dist/server/serverFunction.jsx

@@ -1,4 +1,8 @@
 import { getRequestEvent } from "solid-js/web";
+/**
+ *
+ * Read more: https://docs.solidjs.com/solid-start/reference/server/get-server-function-meta
+ */
 export function getServerFunctionMeta() {
     return getRequestEvent()?.locals.serverFunctionMeta;
 }

package/dist/server/spa/StartServer.d.ts

@@ -1,5 +1,9 @@
 import type { Component } from "solid-js";
 import type { DocumentComponentProps } from "../types";
+/**
+ *
+ * Read more: https://docs.solidjs.com/solid-start/reference/server/start-server
+ */
 export declare function StartServer(props: {
     document: Component<DocumentComponentProps>;
 }): import("solid-js").JSX.Element;

package/dist/server/spa/StartServer.jsx

@@ -1,18 +1,25 @@
 import { NoHydration, getRequestEvent, ssr } from "solid-js/web";
+import { TopErrorBoundary } from "../../shared/ErrorBoundary";
 import { renderAsset } from "../renderAsset";
 const docType = ssr("<!DOCTYPE html>");
+/**
+ *
+ * Read more: https://docs.solidjs.com/solid-start/reference/server/start-server
+ */
 export function StartServer(props) {
     const context = getRequestEvent();
     // @ts-ignore
     const nonce = context.nonce;
     return (<NoHydration>
       {docType}
-      <props.document assets={<>{context.assets.map((m) => renderAsset(m))}</>} scripts={nonce ? (<>
-              <script nonce={nonce} innerHTML={`window.manifest = ${JSON.stringify(context.manifest)}`}/>
-              <script type="module" src={import.meta.env.MANIFEST["client"].inputs[import.meta.env.MANIFEST["client"].handler].output.path}/>
-            </>) : (<>
-              <script innerHTML={`window.manifest = ${JSON.stringify(context.manifest)}`}/>
-              <script type="module" src={import.meta.env.MANIFEST["client"].inputs[import.meta.env.MANIFEST["client"].handler].output.path}/>
-            </>)}/>
+      <TopErrorBoundary>
+        <props.document assets={<>{context.assets.map((m) => renderAsset(m))}</>} scripts={nonce ? (<>
+                <script nonce={nonce} innerHTML={`window.manifest = ${JSON.stringify(context.manifest)}`}/>
+                <script type="module" src={import.meta.env.MANIFEST["client"].inputs[import.meta.env.MANIFEST["client"].handler].output.path}/>
+              </>) : (<>
+                <script innerHTML={`window.manifest = ${JSON.stringify(context.manifest)}`}/>
+                <script type="module" src={import.meta.env.MANIFEST["client"].inputs[import.meta.env.MANIFEST["client"].handler].output.path}/>
+              </>)}/>
+      </TopErrorBoundary>
     </NoHydration>);
 }

package/dist/server/spa/handler.d.ts

@@ -1,3 +1,7 @@
 import { FetchEvent, HandlerOptions, PageEvent } from "../types";
+/**
+ *
+ * Read more: https://docs.solidjs.com/solid-start/reference/server/create-handler
+ */
 export declare function createHandler(fn: (context: PageEvent) => unknown, options?: HandlerOptions | ((context: PageEvent) => HandlerOptions)): import("h3").EventHandler<import("h3").EventHandlerRequest, Promise<any>>;
 export declare function createPageEvent(ctx: FetchEvent): Promise<PageEvent>;

package/dist/server/spa/handler.js

@@ -1,4 +1,8 @@
 import { createBaseHandler } from "../handler";
+/**
+ *
+ * Read more: https://docs.solidjs.com/solid-start/reference/server/create-handler
+ */
 export function createHandler(fn, options) {
     return createBaseHandler(fn, createPageEvent, options);
 }

package/dist/shared/ErrorBoundary.d.ts

@@ -1,2 +1,3 @@
 import { type ParentProps } from "solid-js";
 export declare const ErrorBoundary: (props: ParentProps) => import("solid-js").JSX.Element;
+export declare const TopErrorBoundary: (props: ParentProps) => import("solid-js").JSX.Element;

package/dist/shared/ErrorBoundary.jsx

@@ -1,16 +1,36 @@
 // @refresh skip
-import { ErrorBoundary as DefaultErrorBoundary } from "solid-js";
+import { ErrorBoundary as DefaultErrorBoundary, catchError } from "solid-js";
 import { isServer } from "solid-js/web";
 import { HttpStatusCode } from "./HttpStatusCode";
 import { DevOverlay } from "./dev-overlay";
 export const ErrorBoundary = import.meta.env.DEV && import.meta.env.START_DEV_OVERLAY
     ? (props) => <DevOverlay>{props.children}</DevOverlay>
     : (props) => {
-        const message = isServer ? "500 | Internal Server Error" : "Error | Uncaught Client Exception";
-        return (<DefaultErrorBoundary fallback={<>
-            <span style="font-size:1.5em;text-align:center;position:fixed;left:0px;bottom:55%;width:100%;">{message}</span>
-            <HttpStatusCode code={500}/>
-          </>}>
-        {props.children}
-      </DefaultErrorBoundary>);
+        const message = isServer
+            ? "500 | Internal Server Error"
+            : "Error | Uncaught Client Exception";
+        return (<DefaultErrorBoundary fallback={error => {
+                console.error(error);
+                return (<>
+                  <span style="font-size:1.5em;text-align:center;position:fixed;left:0px;bottom:55%;width:100%;">
+                    {message}
+                  </span>
+                  <HttpStatusCode code={500}/>
+                </>);
+            }}>
+            {props.children}
+          </DefaultErrorBoundary>);
     };
+export const TopErrorBoundary = (props) => {
+    let isError = false;
+    const res = catchError(() => props.children, err => {
+        console.error(err);
+        isError = !!err;
+    });
+    return isError ? (<>
+      <span style="font-size:1.5em;text-align:center;position:fixed;left:0px;bottom:55%;width:100%;">
+        500 | Internal Server Error
+      </span>
+      <HttpStatusCode code={500}/>
+    </>) : (res);
+};

package/dist/shared/GET.d.ts

@@ -1 +1,5 @@
+/**
+ *
+ * Read more: https://docs.solidjs.com/solid-start/reference/server/get
+ */
 export declare function GET<T extends (...args: any[]) => any>(fn: T): (...args: Parameters<T>) => ReturnType<T>;

package/dist/shared/GET.js

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

package/dist/shared/HttpHeader.d.ts

@@ -3,4 +3,8 @@ export interface HttpHeaderProps {
     value: string;
     append?: boolean;
 }
+/**
+ *
+ * Read more: https://docs.solidjs.com/solid-start/reference/server/http-header
+ */
 export declare const HttpHeader: (props: HttpHeaderProps) => null;

package/dist/shared/HttpHeader.jsx

@@ -1,6 +1,10 @@
 // @refresh skip
 import { onCleanup } from "solid-js";
 import { getRequestEvent, isServer } from "solid-js/web";
+/**
+ *
+ * Read more: https://docs.solidjs.com/solid-start/reference/server/http-header
+ */
 export const HttpHeader = isServer
     ? (props) => {
         const event = getRequestEvent();

package/dist/shared/HttpStatusCode.d.ts

@@ -2,4 +2,8 @@ export interface HttpStatusCodeProps {
     code: number;
     text?: string;
 }
+/**
+ *
+ * Read more: https://docs.solidjs.com/solid-start/reference/server/http-status-code
+ */
 export declare const HttpStatusCode: (props: HttpStatusCodeProps) => null;

package/dist/shared/HttpStatusCode.jsx

@@ -1,6 +1,10 @@
 // @refresh skip
 import { onCleanup } from "solid-js";
 import { getRequestEvent, isServer } from "solid-js/web";
+/**
+ *
+ * Read more: https://docs.solidjs.com/solid-start/reference/server/http-status-code
+ */
 export const HttpStatusCode = isServer
     ? (props) => {
         const event = getRequestEvent();

package/dist/shared/clientOnly.d.ts

@@ -1,4 +1,8 @@
 import type { Component, ComponentProps, JSX } from "solid-js";
+/**
+ *
+ * Read more: https://docs.solidjs.com/solid-start/reference/client/client-only
+ */
 export default function clientOnly<T extends Component<any>>(fn: () => Promise<{
     default: T;
 }>): (props: ComponentProps<T> & {

package/dist/shared/clientOnly.jsx

@@ -1,5 +1,9 @@
 import { createMemo, createSignal, onMount, sharedConfig, splitProps, untrack } from "solid-js";
 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) {
     if (isServer)

package/dist/shared/dev-overlay/get-source-map.d.ts

@@ -1,3 +1,2 @@
-/// <reference types=".pnpm/source-map-js@1.2.0/node_modules/source-map-js" />
 import { SourceMapConsumer } from 'source-map-js';
 export default function getSourceMap(url: string, content: string): Promise<SourceMapConsumer | null>;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@solidjs/start",
-  "version": "1.0.0-rc.1",
+  "version": "1.0.1",
   "type": "module",
   "author": "Ryan Carniato",
   "license": "MIT",
@@ -29,7 +29,11 @@
     "./server/spa": "./dist/server/spa/index.jsx",
     "./client": "./dist/client/index.jsx",
     "./client/islands": "./dist/client/islands.jsx",
-    "./client/spa": "./dist/client/spa/index.jsx"
+    "./client/spa": "./dist/client/spa/index.jsx",
+    "./env": {
+      "types": "./env.d.ts",
+      "import": null
+    }
   },
   "typesVersions": {
     "*": {