@solidjs/start 0.4.0-alpha.6 → 0.4.0-alpha.8

package/config/server-runtime.jsx

@@ -69,7 +69,7 @@ async function fetchServerFunction(base, id, args) {
   const instance = `server-fn:${INSTANCE++}`;
   const response = await (args.length === 1 && args[0] instanceof FormData
     ? createRequest(base, id, instance, args[0])
-    : createRequest(base, id, instance, JSON.stringify(await toJSONAsync(args)), "application/json"));
+    : createRequest(base, id, instance, JSON.stringify(await Promise.resolve(toJSONAsync(args))), "application/json"));
 
   if (response.headers.get("Location")) throw response;
   if (response.headers.get("X-Revalidate")) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@solidjs/start",
-  "version": "0.4.0-alpha.6",
+  "version": "0.4.0-alpha.8",
   "type": "module",
   "author": "Ryan Carniato",
   "publishConfig": {
@@ -39,7 +39,7 @@
   },
   "devDependencies": {
     "solid-js": "^1.8.7",
-    "vinxi": "0.0.51"
+    "vinxi": "0.0.52"
   },
   "dependencies": {
     "@vinxi/plugin-directives": "0.0.44",

package/server/StartServer.tsx

@@ -1,7 +1,14 @@
 // @ts-ignore
 import App from "#start/app";
 import type { Component } from "solid-js";
-import { Hydration, HydrationScript, NoHydration, getRequestEvent, ssr } from "solid-js/web";
+import {
+  Hydration,
+  HydrationScript,
+  NoHydration,
+  getRequestEvent,
+  ssr,
+  useAssets
+} from "solid-js/web";
 import { ErrorBoundary } from "../shared/ErrorBoundary";
 import { renderAsset } from "./renderAsset";
 import type { DocumentComponentProps } from "./types";
@@ -10,6 +17,32 @@ const docType = ssr("<!DOCTYPE html>");
 
 export function StartServer(props: { document: Component<DocumentComponentProps> }) {
   const context = getRequestEvent() as any;
+
+  let assets = [];
+  Promise.resolve().then(async () => {
+    let current = context.routes;
+    if (context.routerMatches && context.routerMatches[0]) {
+      for (let i = 0; i < context.routerMatches[0].length; i++) {
+        const match = context.routerMatches[0][i];
+        if (match.metadata && match.metadata.filesystem) {
+          const segment = current.find(r => r.path === match.path);
+          const part = import.meta.env.MANIFEST["client"].inputs[segment["$component"].src];
+          const asset = await part.assets();
+          assets.push.apply(assets, asset);
+          current = segment.children;
+        }
+      }
+    }
+    // dedupe assets
+    assets = [...new Map(assets.map(item => [item.attrs.key, item])).values()].filter(
+      asset =>
+        asset.attrs.rel === "modulepreload" &&
+        !context.assets.find(a => a.attrs.key === asset.attrs.key)
+    );
+  });
+
+  useAssets(() => assets.length ? assets.map(m => renderAsset(m)) : undefined);
+
   return (
     <NoHydration>
       {docType as unknown as any}

package/shared/FileRoutes.tsx

@@ -10,6 +10,7 @@ export function createRoutes() {
     return {
       ...route,
       ...(route.$$route ? route.$$route.require().route : undefined),
+      metadata: { ...(route.$$route ? route.$$route.require().route.metadata : {}), filesystem: true },
       component: lazyRoute(
         route.$component,
         import.meta.env.START_ISLANDS
@@ -26,5 +27,5 @@ export function createRoutes() {
 
 let routes;
 export const FileRoutes = () => {
-  return isServer ? (getRequestEvent() as PageEvent).routes : (routes || (routes = createRoutes()));
+  return isServer ? (getRequestEvent() as PageEvent).routes : routes || (routes = createRoutes());
 };

package/shared/lazyRoute.tsx

@@ -47,9 +47,10 @@ export default function lazyRoute(
 			const mod = await component.import();
 			const Component = mod[exported];
 			let assets = await clientManifest.inputs?.[component.src].assets();
+			const styles = assets.filter((asset) => asset.tag === "style" || asset.attrs.rel === "stylesheet");
 			const Comp = (props) => {
 				return [
-					...assets.map((asset) => renderAsset(asset)),
+					...styles.map((asset) => renderAsset(asset)),
 					createComponent(Component, props),
 				];
 			};

package/shared/routes.ts

@@ -3,6 +3,7 @@ import { HTTPMethod } from "vinxi/server";
 
 interface Route {
   path: string;
+  id: string;
   type: "api" | "page";
   children?: Route[];
 }
@@ -29,7 +30,7 @@ declare module "vinxi/routes" {
 }
 
 export const pageRoutes = defineRoutes((fileRoutes as unknown as Route[]).filter(o => o.type === "page"));
-export const apiRoutes = defineAPIRoutes((fileRoutes as unknown as Route[]).filter(o => o.type === "api"));
+const apiRoutes = defineAPIRoutes((fileRoutes as unknown as Route[]).filter(o => o.type === "api"));
 
 export function matchAPIRoute(path: string, method: HTTPMethod) {
   const segments = path.split("/").filter(Boolean);
@@ -76,20 +77,17 @@ export function matchAPIRoute(path: string, method: HTTPMethod) {
 function defineRoutes(fileRoutes: Route[]) {
   function processRoute(routes: Route[], route: Route, id: string, full: string) {
     const parentRoute = Object.values(routes).find(o => {
-      // if (o.id.endsWith("/index")) {
-      // 	return false;
-      // }
-      return id.startsWith(o.path + "/");
+      return id.startsWith(o.id + "/");
     });
 
     if (!parentRoute) {
-      routes.push({ ...route, path: id });
+      routes.push({ ...route, id, path: id.replace(/\/\([^)/]+\)/g, "") });
       return routes;
     }
     processRoute(
       parentRoute.children || (parentRoute.children = []),
       route,
-      id.slice(parentRoute.path.length),
+      id.slice(parentRoute.id.length),
       full
     );
 
@@ -101,7 +99,7 @@ function defineRoutes(fileRoutes: Route[]) {
     .reduce((prevRoutes, route) => {
       return processRoute(prevRoutes, route, route.path, route.path);
     }, []);
-};
+}
 
 function defineAPIRoutes(routes: Route[]) {
   return routes