@solidjs/start 0.4.5 → 0.4.7

package/config/index.js

@@ -104,7 +104,8 @@ export function defineConfig(baseConfig = {}) {
                 "~": join(process.cwd(), start.appRoot),
                 ...(!start.ssr
                   ? {
-                      "@solidjs/start/server": "@solidjs/start/server/spa"
+                      "@solidjs/start/server": "@solidjs/start/server/spa",
+                      "@solidjs/start/entry": "@solidjs/start/entry/spa"
                     }
                   : {}),
                 ...userConfig.resolve?.alias
@@ -170,6 +171,7 @@ export function defineConfig(baseConfig = {}) {
               "import.meta.env.START_ISLANDS": JSON.stringify(start.islands),
               "import.meta.env.SSR": JSON.stringify(false),
               "import.meta.env.START_SSR": JSON.stringify(start.ssr),
+              "import.meta.env.SERVER_BASE_URL": JSON.stringify(server?.baseURL ?? ""),
               ...userConfig.define
             }
           })

package/config/server-fns-runtime.jsx

@@ -3,10 +3,11 @@ import { provideRequestEvent } from "solid-js/web/storage";
 import { cloneEvent } from "../server/middleware";
 
 export function createServerReference(fn, id, name) {
+  const baseURL = import.meta.env.SERVER_BASE_URL;
   return new Proxy(fn, {
     get(target, prop, receiver) {
       if (prop === "url") {
-        return `/_server?id=${encodeURIComponent(id)}&name=${encodeURIComponent(name)}`;
+        return `${baseURL}/_server?id=${encodeURIComponent(id)}&name=${encodeURIComponent(name)}`;
       }
     },
     apply(target, thisArg, args) {

package/config/server-runtime.jsx

@@ -120,14 +120,15 @@ async function fetchServerFunction(base, id, args) {
 }
 
 export function createServerReference(fn, id, name) {
+  const baseURL = import.meta.env.SERVER_BASE_URL;
   return new Proxy(fn, {
     get(target, prop, receiver) {
       if (prop === "url") {
-        return `/_server?id=${encodeURIComponent(id)}&name=${encodeURIComponent(name)}`;
+        return `${baseURL}/_server?id=${encodeURIComponent(id)}&name=${encodeURIComponent(name)}`;
       }
     },
     apply(target, thisArg, args) {
-      return fetchServerFunction("/_server", `${id}#${name}`, args);
+      return fetchServerFunction(`${baseURL}/_server`, `${id}#${name}`, args);
     }
   });
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@solidjs/start",
-  "version": "0.4.5",
+  "version": "0.4.7",
   "type": "module",
   "author": "Ryan Carniato",
   "publishConfig": {
@@ -17,11 +17,12 @@
   "exports": {
     ".": "./shared/index.tsx",
     "./config": "./config/index.js",
+    "./entry": "./entry/index.ts",
+    "./entry/spa": "./entry/spa/index.ts",
     "./server": "./server/index.tsx",
     "./server/spa": "./server/spa/index.tsx",
     "./client": "./client/index.tsx",
     "./client/islands": "./client/islands.tsx",
-    "./middleware": "./server/middleware.ts",
     "./client/spa": "./client/spa/index.tsx"
   },
   "typesVersions": {
@@ -29,6 +30,9 @@
       ".": [
         "./shared/index.tsx"
       ],
+      "./entry": [
+        "./entry/index.ts"
+      ],
       "./server": [
         "./server/index.tsx"
       ],
@@ -38,7 +42,7 @@
     }
   },
   "devDependencies": {
-    "solid-js": "^1.8.9",
+    "solid-js": "^1.8.10",
     "vinxi": "0.1.1"
   },
   "dependencies": {

package/server/StartServer.tsx

@@ -15,24 +15,40 @@ import type { DocumentComponentProps } from "./types";
 
 const docType = ssr("<!DOCTYPE html>");
 
+function matchRoute(matches, routes, matched = []) {
+  for (let i = 0; i < routes.length; i++) {
+    const segment = routes[i];
+    if (segment.path !== matches[0].path) continue;
+    let next = [...matched, segment];
+    if (segment.children) {
+      const nextMatches = matches.slice(1);
+      if (nextMatches.length === 0) continue;
+      next = matchRoute(nextMatches, segment.children, next);
+      if (!next) continue;
+    }
+    return next;
+  }
+}
+
 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 matches = [...context.routerMatches[0]];
+      while (matches.length && (!matches[0].metadata || !matches[0].metadata.filesystem))
+        matches.shift();
+      const matched = matches.length && matchRoute(matches, context.routes);
+      if (matched) {
+        for (let i = 0; i < matched.length; i++) {
+          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);
-          current = segment.children;
         }
-      }
+      } else console.warn("No route matched for preloading js assets");
     }
     // dedupe assets
     assets = [...new Map(assets.map(item => [item.attrs.key, item])).values()].filter(asset =>

package/server/index.tsx

@@ -2,13 +2,3 @@ export * from "vinxi/server";
 export { StartServer } from "./StartServer";
 export * from "./middleware";
 export * from "./types";
-import { createHandler as createBaseHandler } from "./handler";
-import { createPageEvent } from "./page-event";
-import type { PageEvent } from "./types";
-
-export function createHandler(
-  fn: (context: PageEvent) => unknown,
-  options: Parameters<typeof createBaseHandler>[1] = {}
-) {
-  return createBaseHandler(fn, { ...options, createPageEvent });
-}

package/server/spa/index.tsx

@@ -1,5 +1,4 @@
 export * from "vinxi/server";
-export * from "../handler";
 export * from "../middleware";
 export * from "../types";
 export { StartServer } from "./StartServer";

package/server/handler.tsx

@@ -1,99 +0,0 @@
-import { sharedConfig } from "solid-js";
-import { renderToStream } from "solid-js/web";
-/* @ts-ignore */
-import { provideRequestEvent } from "solid-js/web/storage";
-import {
-  EventHandlerObject,
-  EventHandlerRequest,
-  H3Event,
-  HTTPMethod,
-  eventHandler,
-  sendRedirect,
-  setHeader,
-  setResponseStatus
-} from "vinxi/server";
-import { matchAPIRoute } from "../shared/routes";
-import { getFetchEvent } from "./middleware";
-import { createPageEvent } from "./page-event";
-import { APIEvent, FetchEvent, PageEvent } from "./types";
-
-export function createHandler(
-  fn: (context: PageEvent) => unknown,
-  options: {
-    nonce?: string;
-    renderId?: string;
-    timeoutMs?: number;
-    onCompleteAll?: (options: { write: (v: any) => void }) => void;
-    onCompleteShell?: (options: { write: (v: any) => void }) => void;
-    createPageEvent?: (event: FetchEvent) => Promise<PageEvent>;
-    onRequest?: EventHandlerObject["onRequest"];
-    onBeforeResponse?: EventHandlerObject["onBeforeResponse"];
-  } = {}
-) {
-  return eventHandler({
-    onRequest: options.onRequest,
-    onBeforeResponse: options.onBeforeResponse,
-    handler: (e: H3Event<EventHandlerRequest> & { startEvent: FetchEvent }) => {
-      const event = getFetchEvent(e);
-
-      return provideRequestEvent(event, async () => {
-        // api
-        const match = matchAPIRoute(new URL(event.request.url).pathname, event.request.method as HTTPMethod)
-        if (match) {
-          const mod = await match.handler.import();
-          const fn = mod[event.request.method];
-          (event as APIEvent).params = match.params;
-          sharedConfig.context = { event } as any;
-          return await fn(event);
-        }
-
-        // render stream
-        const doAsync = import.meta.env.START_SSR === "async";
-        const context = await createPageEvent(event);
-        let cloned = { ...options };
-        if (cloned.onCompleteAll) {
-          const og = cloned.onCompleteAll;
-          cloned.onCompleteAll = options => {
-            handleStreamCompleteRedirect(context)(options);
-            og(options);
-          };
-        } else cloned.onCompleteAll = handleStreamCompleteRedirect(context);
-        if (cloned.onCompleteShell) {
-          const og = cloned.onCompleteShell;
-          cloned.onCompleteShell = options => {
-            handleShellCompleteRedirect(context, e)();
-            og(options);
-          };
-        } else cloned.onCompleteShell = handleShellCompleteRedirect(context, e);
-        const stream = renderToStream(() => {
-          (sharedConfig.context as any).event = context;
-          return fn(context)
-        }, cloned);
-        if (context.response && context.response.headers.get("Location")) {
-          return sendRedirect(event, context.response.headers.get("Location"));
-        }
-        if (doAsync) return stream;
-        // fix cloudflare streaming
-        const { writable, readable } = new TransformStream();
-        stream.pipeTo(writable);
-        return readable;
-      });
-    }
-  });
-}
-
-function handleShellCompleteRedirect(context: PageEvent, e: H3Event<EventHandlerRequest>) {
-  return () => {
-    if (context.response && context.response.headers.get("Location")) {
-      setResponseStatus(e, 302);
-      setHeader(e, "Location", context.response.headers.get("Location"));
-    }
-  }
-}
-
-function handleStreamCompleteRedirect(context: PageEvent) {
-  return ({ write }: { write: (html: string) => void }) => {
-    const to = context.response && context.response.headers.get("Location");
-    to && write(`<script>window.location="${to}"</script>`);
-  };
-}

package/server/spa/handler.tsx

@@ -1,24 +0,0 @@
-import { createHandler as createBaseHandler } from "../handler";
-import { FetchEvent, PageEvent } from "../types";
-
-export function createHandler(
-  fn: (context: PageEvent) => unknown,
-  options?: { nonce?: string; renderId?: string; timeoutMs?: number }
-) {
-  return createBaseHandler(fn, { ...options, createPageEvent });
-}
-
-export async function createPageEvent(ctx: FetchEvent) {
-  const clientManifest = import.meta.env.MANIFEST["client"];
-  const pageEvent: PageEvent = Object.assign(ctx, {
-    manifest: await clientManifest.json(),
-    assets: [...(await clientManifest.inputs[clientManifest.handler].assets())],
-    routes: [],
-    // prevUrl: "",
-    // mutation: false,
-    // $type: FETCH_EVENT,
-    $islands: new Set<string>()
-  });
-
-  return pageEvent;
-}