new manifest implementation

Author: Brendonovich

packages/start-vinxi/src/server/pageEvent.ts

@@ -1,21 +1,24 @@
 import { getCookie, setCookie } from "vinxi/http";
 import { createRoutes } from "../router/FileRoutes";
-import { FetchEvent, PageEvent } from "./types";
+import type { FetchEvent, PageEvent } from "./types";
 
 function initFromFlash(ctx: FetchEvent) {
   const flash = getCookie(ctx.nativeEvent, "flash");
   if (!flash) return;
   try {
-    let param = JSON.parse(flash);
+    const param = JSON.parse(flash);
     if (!param || !param.result) return;
-    const input = [...param.input.slice(0, -1), new Map(param.input[param.input.length - 1])];
+    const input = [
+      ...param.input.slice(0, -1),
+      new Map(param.input[param.input.length - 1]),
+    ];
     const result = param.error ? new Error(param.result) : param.result;
     return {
       input,
       url: param.url,
       pending: false,
       result: param.thrown ? undefined : result,
-      error: param.thrown ? result : undefined
+      error: param.thrown ? result : undefined,
     };
   } catch (e) {
     console.error(e);
@@ -38,20 +41,20 @@ export async function createPageEvent(ctx: FetchEvent) {
         ? 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"
-          )
-        : [])
+        ? (
+          await serverManifest.inputs[serverManifest.handler]!.assets()
+        ).filter((s) => (s as any).attrs.rel !== "modulepreload")
+        : []),
     ],
     router: {
-      submission: initFromFlash(ctx) as any
+      submission: initFromFlash(ctx) as any,
     },
     routes: createRoutes(),
     // prevUrl: prevPath || "",
     // mutation: mutation,
     // $type: FETCH_EVENT,
     complete: false,
-    $islands: new Set<string>()
+    $islands: new Set<string>(),
   });
 
   return pageEvent;

packages/start/src/client/StartClient.tsx

@@ -1,6 +1,4 @@
 // @refresh skip
-// @ts-ignore
-import "./client-manifest.js";
 import App from "#start/app";
 import type { JSX } from "solid-js";
 import { ErrorBoundary } from "../shared/ErrorBoundary.jsx";

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

@@ -1,9 +1,10 @@
 import { relative } from "node:path";
 import type { PluginOption, ResolvedConfig } from "vite";
-import { manifest } from "./manifest.js";
 import type { BaseFileSystemRouter } from "./router.js";
 import { treeShake } from "./tree-shake.js";
 
+const getClientManifestPath = new URL("../../server/manifest/client-manifest.js", import.meta.url).pathname;
+
 export const moduleId = "solid-start:routes";
 
 export type RouterBuilder = (config: ResolvedConfig) => BaseFileSystemRouter;
@@ -20,7 +21,6 @@ export function fsRoutes({
   (globalThis as any).ROUTERS = {};
 
   return [
-    manifest(handlers),
     {
       name: "solid-start-fs-routes",
       enforce: "pre",
@@ -82,8 +82,9 @@ ${js.getImportStatements()}
 ${this.environment.name === "server"
             ? ""
             : `
+import { getClientManifest } from "${getClientManifestPath}"
 function clientManifestImport(id) {
-  return import(/* @vite-ignore */ globalThis.MANIFEST.inputs[id].output.path)
+  return getClientManifest().import(id)
 }`
           }
 export default ${routesCode}`;