make asset manifest naming a bit clearer

Author: Brendonovich

packages/start/src/config/index.ts

@@ -225,7 +225,7 @@ function solidStartVitePlugin(options?: SolidStartOptions): Array<PluginOption>
             const manifest: StartServerManifest = {
               clientEntryId: normalizePath(handlers.client),
               clientViteManifest: {},
-              routes: {}
+              clientAssetManifest: {}
             };
 
             return `export const manifest = ${JSON.stringify(manifest)}`;
@@ -236,20 +236,41 @@ function solidStartVitePlugin(options?: SolidStartOptions): Array<PluginOption>
           );
           if (!entry) throw new Error("No client entry found");
 
-          const clientManifest: Record<string, { file: string }> = JSON.parse(
+          const clientManifest: Record<string, Record<string, any>> = JSON.parse(
             (globalThis.START_CLIENT_BUNDLE[".vite/manifest.json"] as any).source
           );
 
-          const routes = Object.entries(clientManifest).reduce((acc, [id, entry]) => {
-            acc[id] = { output: `/${CLIENT_BASE_PATH}/${entry.file}` };
+          const clientAssetManifest = Object.entries(clientManifest).reduce((acc, [id, entry]) => {
+            const assets = [
+              ...(entry.assets?.filter(Boolean) || []),
+              ...(entry.css?.filter(Boolean) || [])
+            ]
+              .filter(
+                (asset) =>
+                  asset.endsWith(".css") ||
+                  asset.endsWith(".js") ||
+                  asset.endsWith(".mjs"),
+              )
+              .map((asset) => ({
+                tag: "link",
+                attrs: {
+                  href: join("/", CLIENT_BASE_PATH, asset),
+                  key: join("/", CLIENT_BASE_PATH, asset),
+                  ...(asset.endsWith(".css")
+                    ? { rel: "stylesheet", fetchPriority: "high" }
+                    : { rel: "modulepreload" }),
+                },
+              } satisfies ManifestAsset));
+            ;
+
+            acc[id] = { output: `/${CLIENT_BASE_PATH}/${entry.file}`, assets };
             return acc;
-          }, {} as Record<string, { output: string }>);
+          }, {} as ClientManifest);
 
           const manifest: StartServerManifest = {
             clientEntryId: normalizePath(handlers.client),
-            // clientEntry: `/${CLIENT_BASE_PATH}/${entry.fileName}`,
             clientViteManifest: clientManifest,
-            routes
+            clientAssetManifest
           };
 
           return `export const manifest = ${JSON.stringify(manifest)};`;

packages/start/src/server/StartServer.tsx

@@ -99,7 +99,7 @@ export function StartServer(props: { document: Component<DocumentComponentProps>
             <>
               <script
                 nonce={nonce}
-                innerHTML={`window.manifest = ${JSON.stringify(manifest.routes)}`}
+                innerHTML={`window.manifest = ${JSON.stringify(manifest.clientAssetManifest)}`}
               />
               <script type="module" nonce={nonce} async src={getClientEntryPath()} />
             </>

packages/start/src/server/index.tsx

@@ -67,7 +67,7 @@ export async function createPageEvent(ctx: FetchEvent) {
   // const prevPath = ctx.request.headers.get("x-solid-referrer");
   // const mutation = ctx.request.headers.get("x-solid-mutation") === "true";
   const pageEvent: PageEvent = Object.assign(ctx, {
-    manifest: manifest.routes,
+    manifest: manifest.clientAssetManifest,
     assets: [
       ...getClientEntryCssTags()
       // not needed anymore?

packages/start/src/server/spa/StartServer.tsx

@@ -29,13 +29,15 @@ export function StartServer(props: { document: Component<DocumentComponentProps>
               <>
                 <script
                   nonce={nonce}
-                  innerHTML={`window.manifest = ${JSON.stringify(manifest.routes)}`}
+                  innerHTML={`window.manifest = ${JSON.stringify(manifest.clientAssetManifest)}`}
                 />
                 <script type="module" nonce={nonce} async src={getClientEntryPath()} />
               </>
             ) : (
               <>
-                <script innerHTML={`window.manifest = ${JSON.stringify(manifest.routes)}`} />
+                <script
+                  innerHTML={`window.manifest = ${JSON.stringify(manifest.clientAssetManifest)}`}
+                />
                 <script type="module" nonce={nonce} async src={getClientEntryPath()} />
               </>
             )

packages/start/src/virtual.d.ts

@@ -1,17 +1,29 @@
+type LinkAssetAttrs = { href: string, key: string } & (
+  { rel: "stylesheet", fetchPriority?: string }
+  | { rel: "modulepreload" });
+
+type ManifestAsset = {
+  tag: "link",
+  attrs: LinkAssetAttrs
+}
+
+type ClientManifest = Record<string, {
+  output: string,
+  assets?: Array<ManifestAsset>
+}>;
+
 declare module "solid-start:server-manifest" {
   interface StartServerManifest {
     clientEntryId: string;
     clientViteManifest: Record<string, { css?: Array<string>, file?: string, [key: string]: unknown }>;
-    routes: Record<string, { output: string }>;
+    clientAssetManifest: ClientManifest;
   }
 
   export const manifest: StartServerManifest;
 }
 
 declare module "solid-start:client-prod-manifest" {
-  type Manifest = Record<string, { output: string }>;
-
-  export default {} as Manifest;
+  export default {} as ClientManifest;
 }
 
 declare module "#start/app" {