move client entry to env

Author: Brendonovich

packages/start/src/config/index.ts

@@ -208,7 +208,8 @@ function solidStartVitePlugin(options?: SolidStartOptions): Array<PluginOption>
           },
           define: {
             "import.meta.env.MANIFEST": `globalThis.MANIFEST`,
-            "import.meta.env.START_SSR": JSON.stringify(start.ssr)
+            "import.meta.env.START_SSR": JSON.stringify(start.ssr),
+            "import.meta.env.START_CLIENT_ENTRY": `${normalizePath(handlers.client)}`
           }
         };
       }
@@ -262,7 +263,6 @@ function solidStartVitePlugin(options?: SolidStartOptions): Array<PluginOption>
         if (id === `\0${VIRTUAL_MODULES.serverManifest}`) {
           if (this.environment.config.command === "serve") {
             const manifest: StartServerManifest = {
-              clientEntryId: normalizePath(handlers.client),
               clientViteManifest: {},
             };
 
@@ -279,7 +279,6 @@ function solidStartVitePlugin(options?: SolidStartOptions): Array<PluginOption>
           );
 
           const manifest: StartServerManifest = {
-            clientEntryId: normalizePath(handlers.client),
             clientViteManifest: clientManifest as any,
           };
 

packages/start/src/env.d.ts

@@ -26,6 +26,7 @@ interface ImportMetaEnv extends Record<`VITE_${string}`, any>, SolidStartMetaEnv
 
 interface SolidStartMetaEnv {
   START_SSR: boolean;
+  START_CLIENT_ENTRY: string;
   // START_ISLANDS: boolean;
   // START_DEV_OVERLAY: boolean;
   // SERVER_BASE_URL: string;

packages/start/src/server/server-manifest.ts

@@ -7,14 +7,14 @@ export const CLIENT_BASE_PATH = "_build";
 
 export function getClientEntryPath() {
   if (import.meta.env.DEV)
-    return normalizePath(path.join("/@fs", path.resolve(process.cwd(), manifest.clientEntryId)));
+    return normalizePath(path.join("/@fs", path.resolve(process.cwd(), import.meta.env.START_CLIENT_ENTRY)));
 
-  const viteManifestEntry = manifest.clientViteManifest[manifest.clientEntryId];
+  const viteManifestEntry = manifest.clientViteManifest[import.meta.env.START_CLIENT_ENTRY];
   if (!viteManifestEntry) throw new Error("No entry found in vite manifest");
 
   return `/${CLIENT_BASE_PATH}/${viteManifestEntry.file}`;
 }
 
 export function getClientEntryCssTags() {
-  return getManifestEntryCssTags(manifest.clientEntryId);
+  return getManifestEntryCssTags(import.meta.env.START_CLIENT_ENTRY);
 }

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

@@ -1,9 +1,8 @@
 import type { JSX } from "solid-js";
-import { getSsrManifest } from "solid-start:get-ssr-manifest";
 
 import { createBaseHandler } from "../handler.js";
-import { getClientEntryCssTags } from "../server-manifest.js";
 import type { FetchEvent, HandlerOptions, PageEvent } from "../types.js";
+import { getSsrManifest } from "../manifest/ssr-manifest.js";
 
 /**
  *
@@ -17,9 +16,10 @@ export function createHandler(
 }
 
 async function createPageEvent(ctx: FetchEvent) {
+  const manifest = getSsrManifest('client');
   const pageEvent: PageEvent = Object.assign(ctx, {
-    manifest: getSsrManifest(false),
-    assets: await getClientEntryCssTags(),
+    manifest: 'json' in manifest ? await manifest.json() : {},
+    assets: await manifest.getAssets(import.meta.env.START_CLIENT_ENTRY),
     routes: [],
     complete: false,
     $islands: new Set<string>(),

packages/start/src/virtual.d.ts

@@ -14,7 +14,6 @@ type ClientManifest = Record<string, {
 
 declare module "solid-start:server-manifest" {
   interface StartServerManifest {
-    clientEntryId: string;
     clientViteManifest: Record<string, { css?: Array<string>, file: string, [key: string]: unknown }>;
   }
 
@@ -28,7 +27,7 @@ interface StartManifest {
 }
 
 declare module "solid-start:get-ssr-manifest" {
-  export const getSsrManifest: (ssr: boolean) => StartManifest;
+  export const getSsrManifest: (target: "client" | "server") => StartManifest;
 }
 
 declare module "solid-start:get-client-manifest" {