@solidjs/start 0.4.0-alpha.7 → 0.4.0-alpha.9

package/config/index.d.ts

@@ -0,0 +1,14 @@
+import { InlineConfig } from "vite";
+
+type SolidStartInlineConfig = Omit<InlineConfig, "router"> & {
+    start?: {
+        ssr?: boolean | "async",
+        extensions?: string[],
+        server?: any,
+        appRoot?: string,
+        middleware?: string,
+        //islands?: boolean TODO: Get PROD bugs working probably missing release
+    }
+}
+
+export declare function defineConfig(baseConfig: SolidStartInlineConfig)

package/config/index.js

@@ -43,10 +43,11 @@ export function defineConfig(baseConfig = {}) {
     appRoot: "./src",
     ssr: true,
     islands: false,
+    solid: {}
   });
   let server = start.server;
   if (!start.ssr) {
-    server = { ...server, prerender: { routes: ["/"] }  };
+    server = { ...server, prerender: { routes: ["/"] } };
   }
 
   return createApp({
@@ -79,7 +80,7 @@ export function defineConfig(baseConfig = {}) {
             runtime: normalize(fileURLToPath(new URL("./server-fns-runtime.jsx", import.meta.url)))
           }),
           start.islands ? serverComponents.server() : null,
-          solid({ ssr: true, extensions: extensions.map(ext => `.${ext}`) }),
+          solid({ ...start.solid, ssr: true, extensions: extensions.map(ext => `.${ext}`) }),
           config("app-server", {
             resolve: {
               alias: {
@@ -89,13 +90,15 @@ export function defineConfig(baseConfig = {}) {
                   ? {
                       "@solidjs/start/server": "@solidjs/start/server/spa"
                     }
-                  : {})
+                  : {}),
+                ...userConfig.resolve?.alias
               }
             },
             define: {
               "import.meta.env.START_ISLANDS": JSON.stringify(start.islands),
               "import.meta.env.SSR": JSON.stringify(true),
-              "import.meta.env.START_SSR": JSON.stringify(start.ssr)
+              "import.meta.env.START_SSR": JSON.stringify(start.ssr),
+              ...userConfig.define
             }
           })
         ]
@@ -118,7 +121,7 @@ export function defineConfig(baseConfig = {}) {
             runtime: normalize(fileURLToPath(new URL("./server-runtime.jsx", import.meta.url)))
           }),
           start.islands ? serverComponents.client() : null,
-          solid({ ssr: start.ssr, extensions: extensions.map(ext => `.${ext}`) }),
+          solid({ ...start.solid, ssr: start.ssr, extensions: extensions.map(ext => `.${ext}`) }),
           config("app-client", {
             resolve: {
               alias: {
@@ -133,13 +136,15 @@ export function defineConfig(baseConfig = {}) {
                   ? {
                       "@solidjs/start/client": "@solidjs/start/client/spa"
                     }
-                  : {})
+                  : {}),
+                ...userConfig.resolve?.alias
               }
             },
             define: {
               "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.START_SSR": JSON.stringify(start.ssr),
+              ...userConfig.define
             }
           })
         ],
@@ -152,7 +157,7 @@ export function defineConfig(baseConfig = {}) {
         plugins: () => [
           config("user", userConfig),
           ...plugins,
-          solid({ ssr: true, extensions: extensions.map(ext => `.${ext}`) }),
+          solid({ ...start.solid, ssr: true, extensions: extensions.map(ext => `.${ext}`) }),
           config("app-server", {
             resolve: {
               alias: {
@@ -162,13 +167,15 @@ export function defineConfig(baseConfig = {}) {
                   ? {
                       "@solidjs/start/server": "@solidjs/start/server/spa"
                     }
-                  : {})
+                  : {}),
+                ...userConfig.resolve?.alias
               }
             },
             define: {
               "import.meta.env.START_ISLANDS": JSON.stringify(start.islands),
               "import.meta.env.SSR": JSON.stringify(true),
-              "import.meta.env.START_SSR": JSON.stringify(start.ssr)
+              "import.meta.env.START_SSR": JSON.stringify(start.ssr),
+              ...userConfig.define
             }
           })
         ],

package/config/server-fns-runtime.jsx

@@ -10,7 +10,9 @@ export function createServerReference(fn, id, name) {
       }
     },
     apply(target, thisArg, args) {
-      const evt = cloneEvent(getRequestEvent());
+      const ogEvt = getRequestEvent();
+      if (!ogEvt) throw new Error("Cannot call server function outside of a request");
+      const evt = cloneEvent(ogEvt);
       evt.serverOnly = true;
       return provideRequestEvent(evt, () => {
         return fn.apply(thisArg, args);

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.7",
+  "version": "0.4.0-alpha.9",
   "type": "module",
   "author": "Ryan Carniato",
   "publishConfig": {

package/server/StartServer.tsx

@@ -21,7 +21,7 @@ export function StartServer(props: { document: Component<DocumentComponentProps>
   let assets = [];
   Promise.resolve().then(async () => {
     let current = context.routes;
-    if (context.routerMatches[0]) {
+    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) {
@@ -41,7 +41,7 @@ export function StartServer(props: { document: Component<DocumentComponentProps>
     );
   });
 
-  useAssets(() => assets.map(m => renderAsset(m)));
+  useAssets(() => assets.length ? assets.map(m => renderAsset(m)) : undefined);
 
   return (
     <NoHydration>

package/server/handler.tsx

@@ -46,6 +46,7 @@ export function createHandler(
         }
 
         // render stream
+        const doAsync = import.meta.env.START_SSR === "async";
         const context = await createPageEvent(event);
         let cloned = { ...options };
         if (cloned.onCompleteAll) {
@@ -66,6 +67,7 @@ export function createHandler(
         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);