@solidjs/start 0.4.4 → 0.4.6

package/config/index.d.ts

@@ -11,7 +11,7 @@ type SolidStartInlineConfig = Omit<InlineConfig, "router"> & {
          * async: ssr is in async mode
          */
         ssr?: boolean | "async",
-        solid: Options,
+        solid?: Options,
         extensions?: string[],
         server?: AppOptions['server'],
         appRoot?: string,
@@ -20,4 +20,4 @@ type SolidStartInlineConfig = Omit<InlineConfig, "router"> & {
     }
 }
 
-export declare function defineConfig(baseConfig?: SolidStartInlineConfig)
+export declare function defineConfig(baseConfig?: SolidStartInlineConfig)

package/config/index.js

@@ -79,7 +79,17 @@ export function defineConfig(baseConfig = {}) {
         extensions,
         target: "server",
         plugins: async () => [
-          config("user", userConfig),
+          config("user", {
+            ...userConfig,
+            optimizeDeps: {
+              ...(userConfig.optimizeDeps || {}),
+              include: [
+                ...(userConfig.optimizeDeps?.include || []),
+                '@solidjs/start > source-map-js',
+                '@solidjs/start > error-stack-parser',
+              ],
+            },
+          }),
           ...(typeof plugins === "function" ? [...(await plugins())] : plugins),
 
           serverTransform({
@@ -121,7 +131,17 @@ export function defineConfig(baseConfig = {}) {
         extensions,
         target: "browser",
         plugins: async () => [
-          config("user", userConfig),
+          config("user", {
+            ...userConfig,
+            optimizeDeps: {
+              ...(userConfig.optimizeDeps || {}),
+              include: [
+                ...(userConfig.optimizeDeps?.include || []),
+                '@solidjs/start > source-map-js',
+                '@solidjs/start > error-stack-parser',
+              ],
+            },
+          }),
           ...(typeof plugins === "function" ? [...(await plugins())] : plugins),
           serverFunctions.client({
             runtime: normalize(fileURLToPath(new URL("./server-runtime.jsx", import.meta.url)))
@@ -150,6 +170,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
             }
           })
@@ -161,7 +182,17 @@ export function defineConfig(baseConfig = {}) {
         runtime: normalize(fileURLToPath(new URL("./server-fns-runtime.jsx", import.meta.url))),
         // routes: solidStartServerFsRouter({ dir: `${start.appRoot}/routes`, extensions }),
         plugins: async () => [
-          config("user", userConfig),
+          config("user", {
+            ...userConfig,
+            optimizeDeps: {
+              ...(userConfig.optimizeDeps || {}),
+              include: [
+                ...(userConfig.optimizeDeps?.include || []),
+                '@solidjs/start > source-map-js',
+                '@solidjs/start > error-stack-parser',
+              ],
+            },
+          }),
           ...(typeof plugins === "function" ? [...(await plugins())] : plugins),
 
           solid({ ...start.solid, ssr: true, extensions: extensions.map(ext => `.${ext}`) }),

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.4",
+  "version": "0.4.6",
   "type": "module",
   "author": "Ryan Carniato",
   "publishConfig": {
@@ -38,7 +38,7 @@
     }
   },
   "devDependencies": {
-    "solid-js": "^1.8.8",
+    "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/middleware.ts

@@ -2,6 +2,7 @@ import {
   defineMiddleware,
   EventHandlerRequest,
   getRequestIP,
+  getRequestURL,
   H3Event,
   sendWebResponse,
   toWebRequest
@@ -18,9 +19,14 @@ const eventTraps = {
 };
 
 export function createFetchEvent(event: H3Event<EventHandlerRequest>): FetchEvent {
+  event.web ||
+    (event.web = {
+      url: getRequestURL(event),
+      request: toWebRequest(event)
+    });
   return new Proxy(
     {
-      request: toWebRequest(event),
+      request: event.web.request,
       clientAddress: getRequestIP(event),
       locals: {},
       // @ts-ignore

package/shared/dev-overlay/styles.css

@@ -27,6 +27,8 @@
   margin-bottom: 2rem;
   z-index: 10;
   gap: 0.5rem;
+  color: rgb(17 24 39);
+  font-family: ui-monospace, SFMono-Regular, Menlo, Monaco, Consolas, "Liberation Mono", "Courier New", monospace;
 }
 
 .dev-overlay-navbar {
@@ -87,7 +89,6 @@
 }
 
 .dev-overlay-page-counter {
-  font-family: ui-monospace, SFMono-Regular, Menlo, Monaco, Consolas, "Liberation Mono", "Courier New", monospace;
   font-size: 0.875rem;
   line-height: 1.25rem;
   font-weight: 600;
@@ -120,7 +121,6 @@
   border-radius: 9999px;
   background-color: rgb(249 250 251);
   padding: 0.25rem 0.5rem;
-  font-family: ui-monospace, SFMono-Regular, Menlo, Monaco, Consolas, "Liberation Mono", "Courier New", monospace;
   font-size: 0.875rem;
   line-height: 1.25rem;
   font-weight: 600;
@@ -146,7 +146,6 @@
 }
 
 .dev-overlay-error-info {
-  font-family: ui-monospace, SFMono-Regular, Menlo, Monaco, Consolas, "Liberation Mono", "Courier New", monospace;
   display: flex;
   flex-direction: column;
   gap: 0.25rem;
@@ -208,7 +207,6 @@
 }
 
 .dev-overlay-stack-frame-function {
-  font-family: ui-monospace, SFMono-Regular, Menlo, Monaco, Consolas, "Liberation Mono", "Courier New", monospace;
   font-weight: 700;
 }
 
@@ -245,7 +243,6 @@
 .dev-overlay-stack-frames-code-source {
   font-size: 0.875rem;
   line-height: 1.25rem;
-  font-family: ui-monospace, SFMono-Regular, Menlo, Monaco, Consolas, "Liberation Mono", "Courier New", monospace;
   color: rgb(249 250 251);
 }