@solidjs/start 0.4.0-alpha.8 → 0.4.0

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

@@ -1,6 +1,7 @@
 import { serverFunctions } from "@vinxi/server-functions/plugin";
 import { serverTransform } from "@vinxi/server-functions/server";
 import defu from "defu";
+import { existsSync } from "node:fs";
 import { join } from "node:path";
 import { fileURLToPath } from "node:url";
 import { createApp, resolve } from "vinxi";
@@ -43,10 +44,15 @@ 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: ["/"] } };
+  }
+  let entryExtension = ".tsx"
+  if (existsSync(join(process.cwd(), start.appRoot, "app.jsx"))) {
+    entryExtension = ".jsx"
   }
 
   return createApp({
@@ -67,7 +73,7 @@ export function defineConfig(baseConfig = {}) {
       {
         name: "ssr",
         mode: "handler",
-        handler: `${start.appRoot}/entry-server.tsx`,
+        handler: `${start.appRoot}/entry-server${entryExtension}`,
         middleware: start.middleware,
         routes: solidStartServerFsRouter({ dir: `${start.appRoot}/routes`, extensions }),
         extensions,
@@ -79,23 +85,25 @@ 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: {
-                "#start/app": join(process.cwd(), start.appRoot, "app.tsx"),
+                "#start/app": join(process.cwd(), start.appRoot, `app${entryExtension}`),
                 "~": join(process.cwd(), start.appRoot),
                 ...(!start.ssr
                   ? {
                       "@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
             }
           })
         ]
@@ -103,7 +111,7 @@ export function defineConfig(baseConfig = {}) {
       {
         name: "client",
         mode: "build",
-        handler: `${start.appRoot}/entry-client.tsx`,
+        handler: `${start.appRoot}/entry-client${entryExtension}`,
         ...(start.islands
           ? {}
           : {
@@ -118,11 +126,11 @@ 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: {
-                "#start/app": join(process.cwd(), start.appRoot, "app.tsx"),
+                "#start/app": join(process.cwd(), start.appRoot, `app${entryExtension}`),
                 "~": join(process.cwd(), start.appRoot),
                 ...(start.islands
                   ? {
@@ -133,13 +141,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,23 +162,25 @@ 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: {
-                "#start/app": join(process.cwd(), start.appRoot, "app.tsx"),
+                "#start/app": join(process.cwd(), start.appRoot, `app${entryExtension}`),
                 "~": join(process.cwd(), start.appRoot),
                 ...(!start.ssr
                   ? {
                       "@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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@solidjs/start",
-  "version": "0.4.0-alpha.8",
+  "version": "0.4.0",
   "type": "module",
   "author": "Ryan Carniato",
   "publishConfig": {

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);