@solidjs/start 0.4.0 → 0.4.2

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
+        islands?: boolean
     }
 }
 
-export declare function defineConfig(baseConfig: SolidStartInlineConfig)
+export declare function defineConfig(baseConfig?: SolidStartInlineConfig)

package/config/index.js

@@ -38,18 +38,20 @@ function solidStartServerFsRouter(config) {
 }
 
 export function defineConfig(baseConfig = {}) {
-  let { plugins = [], start = {}, ...userConfig } = baseConfig;
+  let { plugins = [], start = {}, base, ...userConfig } = baseConfig;
   const extensions = [...DEFAULT_EXTENSIONS, ...(start.extensions || [])];
   start = defu(start, {
     appRoot: "./src",
     ssr: true,
     islands: false,
+    server: { base },
     solid: {}
   });
   let server = start.server;
   if (!start.ssr) {
     server = { ...server, prerender: { routes: ["/"] } };
   }
+  console.log("start", start)
   let entryExtension = ".tsx"
   if (existsSync(join(process.cwd(), start.appRoot, "app.jsx"))) {
     entryExtension = ".jsx"

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",
+  "version": "0.4.2",
   "type": "module",
   "author": "Ryan Carniato",
   "publishConfig": {
@@ -39,14 +39,15 @@
   },
   "devDependencies": {
     "solid-js": "^1.8.7",
-    "vinxi": "0.0.52"
+    "vinxi": "0.0.54"
   },
   "dependencies": {
-    "@vinxi/plugin-directives": "0.0.44",
-    "@vinxi/server-components": "0.0.44",
-    "@vinxi/server-functions": "0.0.45",
+    "@vinxi/plugin-directives": "0.0.50",
+    "@vinxi/server-components": "0.0.50",
+    "@vinxi/server-functions": "0.0.51",
     "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"
   },

package/server/StartServer.tsx

@@ -26,7 +26,8 @@ export function StartServer(props: { document: Component<DocumentComponentProps>
         const match = context.routerMatches[0][i];
         if (match.metadata && match.metadata.filesystem) {
           const segment = current.find(r => r.path === match.path);
-          const part = import.meta.env.MANIFEST["client"].inputs[segment["$component"].src];
+          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;
@@ -34,26 +35,32 @@ export function StartServer(props: { document: Component<DocumentComponentProps>
       }
     }
     // dedupe assets
-    assets = [...new Map(assets.map(item => [item.attrs.key, item])).values()].filter(
-      asset =>
-        asset.attrs.rel === "modulepreload" &&
-        !context.assets.find(a => a.attrs.key === asset.attrs.key)
+    assets = [...new Map(assets.map(item => [item.attrs.key, item])).values()].filter(asset =>
+      import.meta.env.START_ISLANDS
+        ? false
+        : asset.attrs.rel === "modulepreload" &&
+          !context.assets.find(a => a.attrs.key === asset.attrs.key)
     );
   });
 
-  useAssets(() => assets.length ? assets.map(m => renderAsset(m)) : undefined);
+  useAssets(() => (assets.length ? assets.map(m => renderAsset(m)) : undefined));
 
   return (
     <NoHydration>
       {docType as unknown as any}
       <props.document
-        assets={<>{context.assets.map(m => renderAsset(m))}</>}
-        scripts={
+        assets={
           <>
             <HydrationScript />
+            {context.assets.map(m => renderAsset(m))}
+          </>
+        }
+        scripts={
+          <>
             <script innerHTML={`window.manifest = ${JSON.stringify(context.manifest)}`} />
             <script
               type="module"
+              async
               src={
                 import.meta.env.MANIFEST["client"].inputs[
                   import.meta.env.MANIFEST["client"].handler

package/server/page-event.tsx

@@ -35,7 +35,9 @@ export async function createPageEvent(ctx: FetchEvent) {
     assets: [
       ...(await clientManifest.inputs[clientManifest.handler].assets()),
       ...(import.meta.env.START_ISLANDS
-        ? await serverManifest.inputs[serverManifest.handler].assets()
+        ? (await serverManifest.inputs[serverManifest.handler].assets()).filter(
+            s => (s as any).attrs.rel !== "modulepreload"
+          )
         : [])
     ],
     initialSubmission: initFromFlash(ctx),

package/server/spa/StartServer.tsx

@@ -10,11 +10,15 @@ export function StartServer(props) {
     <NoHydration>
       {docType as unknown as any}
       <props.document
-        assets={<>{context.assets.map(m => renderAsset(m))}</>}
+        assets={
+          <>
+            <script>$R = [];</script>
+            {context.assets.map(m => renderAsset(m))}
+          </>
+        }
         scripts={
           <>
             <script innerHTML={`window.manifest = ${JSON.stringify(context.manifest)}`} />
-            <script>$R = [];</script>
             <script
               type="module"
               src={