@solidjs/start 0.4.0-alpha.9 → 0.4.1

package/config/fs-router.js

@@ -57,6 +57,19 @@ export class SolidStartClientFileRouter extends BaseFileSystemRouter {
     }
   }
 }
+const HTTP_METHODS = ["GET", "POST", "PUT", "DELETE", "PATCH"];
+function createHTTPHandlers(src, exports) {
+  const handlers = {};
+  for (const exp of exports) {
+    if (HTTP_METHODS.includes(exp.n)) {
+      handlers[`$${exp.n}`] = {
+        src: src,
+        pick: [exp.n]
+      };
+    }
+  }
+  return handlers;
+}
 export class SolidStartServerFileRouter extends BaseFileSystemRouter {
   toPath(src) {
     const routePath = cleanPath(src, this.config)
@@ -110,25 +123,10 @@ export class SolidStartServerFileRouter extends BaseFileSystemRouter {
         path,
         filePath: src
       };
-    } else if (
-      exports.find(
-        exp => exp.n === "GET" || exp.n === "POST" || exp.n === "PUT" || exp.n === "DELETE"
-      )
-    ) {
+    } else if (exports.find(exp => HTTP_METHODS.includes(exp.n))) {
       return {
         type: "api",
-        $GET: exports.find(exp => exp.n === "GET")
-          ? {
-              src: src,
-              pick: ["GET"]
-            }
-          : undefined,
-        $POST: exports.find(exp => exp.n === "POST")
-          ? {
-              src: src,
-              pick: ["POST"]
-            }
-          : undefined,
+        ...createHTTPHandlers(src, exports),
         path,
         filePath: src
       };

package/config/index.d.ts

@@ -1,14 +1,15 @@
+import { AppOptions } from "vinxi";
 import { InlineConfig } from "vite";
 
 type SolidStartInlineConfig = Omit<InlineConfig, "router"> & {
     start?: {
         ssr?: boolean | "async",
         extensions?: string[],
-        server?: any,
+        server?: AppOptions['server'],
         appRoot?: string,
         middleware?: string,
         //islands?: boolean TODO: Get PROD bugs working probably missing release
     }
 }
 
-export declare function defineConfig(baseConfig: SolidStartInlineConfig)
+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";
@@ -49,6 +50,10 @@ export function defineConfig(baseConfig = {}) {
   if (!start.ssr) {
     server = { ...server, prerender: { routes: ["/"] } };
   }
+  let entryExtension = ".tsx"
+  if (existsSync(join(process.cwd(), start.appRoot, "app.jsx"))) {
+    entryExtension = ".jsx"
+  }
 
   return createApp({
     server: {
@@ -68,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,
@@ -84,7 +89,7 @@ export function defineConfig(baseConfig = {}) {
           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
                   ? {
@@ -106,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
           ? {}
           : {
@@ -125,7 +130,7 @@ export function defineConfig(baseConfig = {}) {
           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
                   ? {
@@ -161,7 +166,7 @@ export function defineConfig(baseConfig = {}) {
           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
                   ? {

package/config/server-handler.js

@@ -1,5 +1,17 @@
 /// <reference types="vinxi/types/server" />
 import { crossSerializeStream, fromJSON } from "seroval";
+import {
+  CustomEventPlugin,
+  DOMExceptionPlugin,
+  EventPlugin,
+  FormDataPlugin,
+  HeadersPlugin,
+  ReadableStreamPlugin,
+  RequestPlugin,
+  ResponsePlugin,
+  URLPlugin,
+  URLSearchParamsPlugin,
+} from 'seroval-plugins/web';
 import { provideRequestEvent } from "solid-js/web/storage";
 import invariant from "vinxi/lib/invariant";
 import {
@@ -17,6 +29,18 @@ function serializeToStream(id, value) {
     start(controller) {
       crossSerializeStream(value, {
         scopeId: id,
+        plugins: [
+          CustomEventPlugin,
+          DOMExceptionPlugin,
+          EventPlugin,
+          FormDataPlugin,
+          HeadersPlugin,
+          ReadableStreamPlugin,
+          RequestPlugin,
+          ResponsePlugin,
+          URLSearchParamsPlugin,
+          URLPlugin,
+        ],
         onSerialize(data, initial) {
           const result = initial ? `($R["${id}"]=[],${data})` : data;
           controller.enqueue(new TextEncoder().encode(`${result};\n`));
@@ -67,7 +91,20 @@ async function handleServerFunction(event) {
   ) {
     parsed.push(await readFormData(event));
   } else {
-    parsed = fromJSON(await readBody(event));
+    parsed = fromJSON(await readBody(event), {
+      plugins: [
+        CustomEventPlugin,
+        DOMExceptionPlugin,
+        EventPlugin,
+        FormDataPlugin,
+        HeadersPlugin,
+        ReadableStreamPlugin,
+        RequestPlugin,
+        ResponsePlugin,
+        URLSearchParamsPlugin,
+        URLPlugin,
+      ],
+    });
   }
   try {
     const result = await provideRequestEvent(getFetchEvent(event), () => action(...parsed));

package/config/server-runtime.jsx

@@ -1,4 +1,16 @@
 import { deserialize, toJSONAsync } from "seroval";
+import {
+  CustomEventPlugin,
+  DOMExceptionPlugin,
+  EventPlugin,
+  FormDataPlugin,
+  HeadersPlugin,
+  ReadableStreamPlugin,
+  RequestPlugin,
+  ResponsePlugin,
+  URLPlugin,
+  URLSearchParamsPlugin,
+} from 'seroval-plugins/web';
 import { createIslandReference } from "../server/islands";
 
 async function deserializeStream(id, response) {
@@ -41,7 +53,7 @@ async function deserializeStream(id, response) {
 
   pop().then(
     () => {
-      delete self.$R[id];
+      delete $R[id];
     },
     () => {
       // no-op
@@ -69,7 +81,20 @@ 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 Promise.resolve(toJSONAsync(args))), "application/json"));
+    : createRequest(base, id, instance, JSON.stringify(await Promise.resolve(toJSONAsync(args, {
+      plugins: [
+        CustomEventPlugin,
+        DOMExceptionPlugin,
+        EventPlugin,
+        FormDataPlugin,
+        HeadersPlugin,
+        ReadableStreamPlugin,
+        RequestPlugin,
+        ResponsePlugin,
+        URLSearchParamsPlugin,
+        URLPlugin,
+      ],
+    }))), "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.9",
+  "version": "0.4.1",
   "type": "module",
   "author": "Ryan Carniato",
   "publishConfig": {
@@ -46,7 +46,8 @@
     "@vinxi/server-components": "0.0.44",
     "@vinxi/server-functions": "0.0.45",
     "defu": "^6.1.2",
-    "seroval": "^0.14.1",
+    "seroval": "^1.0.0",
+    "seroval-plugins": "^1.0.1",
     "vite-plugin-inspect": "^0.7.33",
     "vite-plugin-solid": "^2.8.0"
   },