cleanup

Author: Brendonovich

packages/start/src/config/index.ts

@@ -39,7 +39,7 @@ const SolidStartServerFnsPlugin = createTanStackServerFnPlugin({
         fileURLToPath(new URL("../server/server-runtime.js", import.meta.url))
       )}"`,
     replacer: opts =>
-      `createServerReference(${() => {}}, '${opts.functionId}', '${opts.extractedFilename}')`
+      `createServerReference(${() => { }}, '${opts.functionId}', '${opts.extractedFilename}')`
   },
   ssr: {
     getRuntimeCode: () =>
@@ -72,8 +72,8 @@ const VIRTUAL_MODULES = {
 
 export const CLIENT_BASE_PATH = "_build";
 
-function solidStartVitePlugin(options: SolidStartOptions): Array<PluginOption> {
-  const start = defu(options, {
+function solidStartVitePlugin(options?: SolidStartOptions): Array<PluginOption> {
+  const start = defu(options ?? {}, {
     appRoot: "./src",
     routeDir: "./routes",
     ssr: true,
@@ -172,14 +172,10 @@ function solidStartVitePlugin(options: SolidStartOptions): Array<PluginOption> {
               "~": join(process.cwd(), start.appRoot),
               ...(!start.ssr
                 ? {
-                    "@solidjs/start/server": "@solidjs/start/server/spa"
-                  }
+                  "@solidjs/start/server": "@solidjs/start/server/spa",
+                  "@solidjs/start/client": "@solidjs/start/client/spa"
+                }
                 : {}),
-              ...(!start.ssr
-                ? {
-                    "@solidjs/start/client": "@solidjs/start/client/spa"
-                  }
-                : {})
             }
           },
           define: {
@@ -273,7 +269,7 @@ export default window.manifest;
         globalThis.START_CLIENT_BUNDLE = bundle;
       }
     },
-    solid({ ...start.solid, ssr: true, extensions: extensions.map(ext => `.${ext}`) })
+    solid({ ...start.solid, ssr: start.ssr, extensions: extensions.map(ext => `.${ext}`) })
   ];
 }
 

packages/start/src/server/spa/handler.ts

@@ -1,45 +1,27 @@
 import type { JSX } from "solid-js";
-import { manifest } from "solid-start:server-manifest";
-import { createRoutes } from "../../router";
+
 import { createHandler as createBaseHandler } from "../index";
 import { getClientEntryCssTags } from "../server-manifest";
-import { FetchEvent, HandlerOptions, PageEvent } from "../types";
+import type { FetchEvent, HandlerOptions, PageEvent } from "../types";
 
 /**
  *
  * Read more: https://docs.solidjs.com/solid-start/reference/server/create-handler
  */
 export function createHandler(
   fn: (context: PageEvent) => JSX.Element,
-  options?: HandlerOptions | ((context: PageEvent) => HandlerOptions)
+  options?: HandlerOptions | ((context: PageEvent) => HandlerOptions),
 ) {
   return createBaseHandler(fn, options);
 }
 
 export async function createPageEvent(ctx: FetchEvent) {
   const pageEvent: PageEvent = Object.assign(ctx, {
-    manifest: manifest.routes,
-    assets: [
-      ...(await getClientEntryCssTags())
-      // not needed anymore?
-      // ...(import.meta.env.DEV
-      //   ? await clientManifest.inputs[import.meta.env.START_APP]!.assets()
-      //   : []),
-      // ...(import.meta.env.START_ISLANDS
-      //   ? (await serverManifest.inputs[serverManifest.handler]!.assets()).filter(
-      //       s => (s as any).attrs.rel !== "modulepreload"
-      //     )
-      //   : [])
-    ],
-    //   router: {
-    //     // submission: initFromFlash(ctx) as any
-    //   },
-    routes: createRoutes(),
-    //   // prevUrl: prevPath || "",
-    //   // mutation: mutation,
-    //   // $type: FETCH_EVENT,
+    manifest: {},
+    assets: [...getClientEntryCssTags()],
+    routes: [],
     complete: false,
-    $islands: new Set<string>()
+    $islands: new Set<string>(),
   });
 
   return pageEvent;