@withl5e/l5e 1.0.1 → 1.1.0-alpha.1

package/dist/{server-DXNRPyGJ.js → server-BOdEiJoN.js}

@@ -62,51 +62,79 @@ function E(e) {
 		}
 	};
 }
-async function D(e, t) {
-	let n = e.map((e) => t.fileForScript(e)), r = t.inlineableRoots(n), i = new Map(n.flatMap((e, n) => !t.isPreserved(e) && !r.has(e) ? [[e, `entry-${n}`]] : [])), a = {
+function D(e, t, n) {
+	return {
+		name: "compact-build-graph",
+		resolveId(r, i) {
+			if (!i || r === w) return null;
+			let a = u.isAbsolute(r) ? u.normalize(r) : r.startsWith("/") ? e.fileForAssetUrl(r) : r.startsWith(".") ? u.resolve(u.dirname(i), r) : null;
+			return a ? e.isShared(a) && t ? {
+				id: t,
+				external: "absolute"
+			} : e.isGlobalOwned(a) && n ? {
+				id: n,
+				external: "absolute"
+			} : { id: a } : null;
+		}
+	};
+}
+async function O(e, t, n = {}) {
+	let r = e.map((e) => t.fileForScript(e)), i = n.compact && t.compact, a = t.inlineableRoots(r), o = new Map(r.flatMap((e, n) => !t.isPreserved(e) && !a.has(e) ? [[e, `entry-${n}`]] : [])), s = (n.islands || []).map(({ key: e, script: n }) => ({
+		key: e,
+		file: t.fileForScript(n)
+	})), c = n.renderer ? t.fileForScript(n.renderer) : void 0, l = (n.exportScripts || []).map((e) => t.fileForScript(e)), d = {
 		input: w,
-		plugins: [T(n.map((e) => `import ${JSON.stringify(e)};`).join("\n")), E(t)],
+		plugins: [T([
+			...r.map((e) => n.name === "shared" ? `export * from ${JSON.stringify(e)};` : `import ${JSON.stringify(e)};`),
+			...l.map((e) => `export * from ${JSON.stringify(e)};`),
+			...s.length ? [
+				"globalThis.__L5E_ISLANDS__ ||= {};",
+				...s.map(({ key: e, file: t }) => `globalThis.__L5E_ISLANDS__[${JSON.stringify(e)}] = async () => { const [renderer, module] = await Promise.all([import(${JSON.stringify(c)}), import(${JSON.stringify(t)})]); return { reactDomClient: renderer.reactDomClient, createElement: renderer.createElement, module }; };`),
+				"globalThis.__L5E_BOOT_ISLANDS__?.();"
+			] : []
+		].join("\n")), i ? D(t, n.sharedUrl, n.globalUrl) : E(t)],
 		platform: "neutral",
 		tsconfig: !1,
 		treeshake: { moduleSideEffects: () => !0 },
 		external: (e) => !e.startsWith(".") && !u.isAbsolute(e) && e !== w
-	}, o = {
+	}, f = {
 		format: "es",
-		codeSplitting: { groups: [{ name: (e) => i.get(e) ?? null }] },
+		codeSplitting: !i && { groups: [{ name: (e) => o.get(e) ?? null }] },
 		minify: !1,
-		entryFileNames: "bundle-[hash].js",
-		chunkFileNames: `bundle-${C(JSON.stringify(n))}-[hash].js`
-	}, { rolldown: s } = await v(), c = await s(a), l;
+		entryFileNames: `${n.name || "bundle"}-[hash].js`,
+		strictExecutionOrder: i,
+		chunkFileNames: `bundle-${C(JSON.stringify(r))}-[hash].js`
+	}, { rolldown: p } = await v(), m = await p(d), h;
 	try {
-		({output: l} = await c.generate(o));
+		({output: h} = await m.generate(f));
 	} finally {
-		await c.close();
+		await m.close();
 	}
-	for (let e of l) e.type === "chunk" && b.set(e.fileName, {
+	for (let e of h) e.type === "chunk" && b.set(e.fileName, {
 		content: e.code || "",
 		hash: C(e.code || ""),
 		filename: e.fileName,
 		mimeType: "application/javascript"
 	});
-	let d = l.find((e) => e.type === "chunk" && e.isEntry && e.facadeModuleId === w);
-	if (!d) throw Error("[bundler] rolldown produced no entry chunk");
+	let g = h.find((e) => e.type === "chunk" && e.isEntry && e.facadeModuleId === w);
+	if (!g) throw Error("[bundler] rolldown produced no entry chunk");
 	return {
-		hash: C(d.code || ""),
-		filename: d.fileName,
-		content: d.code || ""
+		hash: C(g.code || ""),
+		filename: g.fileName,
+		content: g.code || ""
 	};
 }
-async function O(e, t, n) {
+async function k(e, t, n, r = {}) {
 	if (e.length === 0) return y;
 	if (!n || n.directory !== u.resolve(t)) return console.warn("[bundler] No matching build manifest; serving original script entries."), y;
-	let r = [...new Set(e)].sort(), i = `scripts:${n.cacheKey}:${JSON.stringify(r)}`;
+	let i = [...new Set(e)], a = `scripts:${n.cacheKey}:${JSON.stringify([i, r])}`;
 	try {
-		return await S(i, () => D(r, n));
+		return await S(a, () => O(i, n, r));
 	} catch (e) {
 		return console.error("[bundler] Error bundling scripts:", e), y;
 	}
 }
-async function k(e, t) {
+async function A(e, t) {
 	let n = [];
 	for (let r of e) {
 		let e = r.startsWith("/") ? u.join(t, r.substring(1)) : u.join(t, r);
@@ -129,95 +157,113 @@ async function k(e, t) {
 		content: r
 	};
 }
-async function A(e, t) {
+async function j(e, t) {
 	if (e.length === 0) return y;
 	let n = [...new Set(e)].sort(), r = `css:${JSON.stringify([u.resolve(t), n])}`;
 	try {
-		return await S(r, () => k(n, t));
+		return await S(r, () => A(n, t));
 	} catch (e) {
 		return console.error("[bundler] Error bundling CSS:", e), y;
 	}
 }
-function j(e) {
+function M(e) {
 	return b.get(e);
 }
 //#endregion
 //#region src/core/script-bundle-policy.ts
-function M(e, t, n = "/") {
-	let r = u.resolve(t), i = h(r), a = /* @__PURE__ */ new Set(), o = /* @__PURE__ */ new Set(), c = /* @__PURE__ */ new Map(), l = Object.entries(e).filter(([, e]) => /\.[cm]?js$/.test(e.file));
-	function d(e) {
-		let t = u.resolve(i, e), n = u.relative(i, t);
+function N(e, t, n = "/", r) {
+	let i = u.resolve(t), a = h(i), o = /* @__PURE__ */ new Set(), c = /* @__PURE__ */ new Set(), l = /* @__PURE__ */ new Map(), d = Object.entries(e).filter(([, e]) => /\.[cm]?js$/.test(e.file));
+	function f(e) {
+		let t = u.resolve(a, e), n = u.relative(a, t);
 		if (!n || n === ".." || n.startsWith(`..${u.sep}`) || u.isAbsolute(n)) throw Error(`[bundler] Asset is outside the client output: ${e}`);
 		return t;
 	}
-	for (let [e, t] of l) {
-		let n = d(t.file);
-		a.add(n), (!t.isEntry || t.isDynamicEntry || e === "src/client.global.ts" || /(?:^|\/)react\//.test(t.src || e)) && o.add(n);
+	let m = new Set((r?.chunks || []).filter((e) => r?.mode === "compact" && e.canonicalShared).map((e) => f(e.file))), g = new Set((r?.chunks || []).filter((e) => r?.mode === "compact" && e.canonicalGlobal).map((e) => f(e.file)));
+	for (let [e, t] of d) {
+		let n = f(t.file);
+		o.add(n), (!t.isEntry || t.isDynamicEntry || e === "src/client.global.ts" || /(?:^|\/)react\//.test(t.src || e)) && c.add(n);
 	}
-	for (let [, t] of l) {
+	for (let [, t] of d) {
 		for (let n of [...t.imports || [], ...t.dynamicImports || []]) {
 			let t = e[n];
-			if (!t || !a.has(d(t.file))) throw Error(`[bundler] Missing JavaScript manifest dependency: ${n}`);
-			o.add(d(t.file));
+			if (!t || !o.has(f(t.file))) throw Error(`[bundler] Missing JavaScript manifest dependency: ${n}`);
+			c.add(f(t.file));
 		}
-		c.set(d(t.file), (t.imports || []).map((t) => d(e[t].file)));
+		l.set(f(t.file), (t.imports || []).map((t) => f(e[t].file)));
 	}
 	return {
 		cacheKey: p("sha256").update(JSON.stringify([
-			r,
 			i,
+			a,
 			n,
 			e
 		])).digest("hex"),
-		directory: r,
+		compact: r?.mode === "compact",
+		directory: i,
 		fileForScript(e) {
-			let t = d(e.replace(/^\/+/, ""));
-			if (!a.has(t)) throw Error(`[bundler] Script is missing from manifest: ${e}`);
-			return t;
+			let t = n === "/" ? "/" : `/${n.replace(/^\/+|\/+$/g, "")}/`, r = f(e.startsWith(t) ? e.slice(t.length) : e.replace(/^\/+/, ""));
+			if (!o.has(r)) throw Error(`[bundler] Script is missing from manifest: ${e}`);
+			return r;
+		},
+		fileForAssetUrl(e) {
+			let t = n === "/" ? "/" : `/${n.replace(/^\/+|\/+$/g, "")}/`, r = f(e.startsWith(t) ? e.slice(t.length) : e.replace(/^\/+/, ""));
+			return o.has(r) ? r : void 0;
 		},
 		isPreserved(e) {
-			return o.has(e);
+			return c.has(e);
+		},
+		isShared(e) {
+			return m.has(e);
+		},
+		isGlobalOwned(e) {
+			return g.has(e);
+		},
+		sharedScripts() {
+			return [...m].map((e) => s(n, u.relative(a, e).replace(/\\/g, "/")));
+		},
+		globalOwnedScripts() {
+			return [...g].map((e) => s(n, u.relative(a, e).replace(/\\/g, "/")));
 		},
 		inlineableRoots(e) {
 			let t = /* @__PURE__ */ new Set(), n = 0;
 			function r(e, i) {
 				if (!t.has(e)) {
 					t.add(e);
-					for (let t of c.get(e) || []) r(t, i);
-					o.has(e) && (n = i);
+					for (let t of l.get(e) || []) r(t, i);
+					c.has(e) && (n = i);
 				}
 			}
 			return e.forEach((e, t) => {
-				r(e, t), o.has(e) && (n = t + 1);
-			}), new Set(e.slice(n).filter((e) => !o.has(e)));
+				r(e, t), c.has(e) && (n = t + 1);
+			}), new Set(e.slice(n).filter((e) => !c.has(e)));
 		},
 		assetUrl(e) {
-			if (!a.has(e)) throw Error(`[bundler] Import is missing from manifest: ${e}`);
-			return s(n, u.relative(i, e).replace(/\\/g, "/"));
+			if (!o.has(e)) throw Error(`[bundler] Import is missing from manifest: ${e}`);
+			return s(n, u.relative(a, e).replace(/\\/g, "/"));
 		}
 	};
 }
 //#endregion
 //#region src/core/server.ts
-function N(e, t) {
+function P(e, t) {
 	let r = n(t);
 	return e.replace(/<html\b([^>]*)>/i, (e, t) => /\blang\s*=/i.test(t) ? e.replace(/lang\s*=\s*"[^"]*"/i, () => `lang="${r}"`) : `<html lang="${r}"${t}>`);
 }
-function P(e) {
+function F(e) {
 	return new URL(`${e.protocol}://${e.get("host")}${e.originalUrl}`);
 }
-function F(e, t) {
+function I(e, t) {
 	return `${e.pathname}${e.search}`.replace(t, "") || "/";
 }
-function I(e) {
+function L(e) {
 	let t = {
 		method: e.method,
 		headers: i(e)
 	};
-	return e.method !== "GET" && e.method !== "HEAD" && (t.body = e, t.duplex = "half"), new globalThis.Request(P(e).href, t);
+	return e.method !== "GET" && e.method !== "HEAD" && (t.body = e, t.duplex = "half"), new globalThis.Request(F(e).href, t);
 }
-function L(e, t, n, i) {
-	let a = new URL(t.url), o = F(a, n), s = o.startsWith("/") ? o : `/${o}`, c = {};
+function R(e, t, n, i) {
+	let a = new URL(t.url), o = I(a, n), s = o.startsWith("/") ? o : `/${o}`, c = {};
 	return t.headers.forEach((e, t) => {
 		c[t] = e;
 	}), {
@@ -232,12 +278,12 @@ function L(e, t, n, i) {
 		locals: i
 	};
 }
-function R(e, t, n) {
+function z(e, t, n) {
 	return e ? e instanceof globalThis.Request ? e : e instanceof URL ? new globalThis.Request(e.href, t.clone()) : new globalThis.Request(new URL(e, n).href, t.clone()) : t;
 }
-async function z(e, t, n) {
+async function B(e, t, n) {
 	t.status(n.status);
-	let r = B(n.headers);
+	let r = V(n.headers);
 	if (n.headers.forEach((e, n) => {
 		n.toLowerCase() !== "set-cookie" && t.setHeader(n, e);
 	}), r.length > 0 && t.setHeader("Set-Cookie", r), e.method === "HEAD") {
@@ -247,15 +293,15 @@ async function z(e, t, n) {
 	let i = Buffer.from(await n.arrayBuffer());
 	t.send(i);
 }
-function B(e) {
+function V(e) {
 	let t = e.getSetCookie;
 	if (typeof t == "function") return t.call(e);
 	let n = e.raw?.();
 	if (n?.["set-cookie"]) return n["set-cookie"];
 	let r = e.get("set-cookie");
-	return r ? V(r) : [];
+	return r ? H(r) : [];
 }
-function V(e) {
+function H(e) {
 	let t = [], n = 0;
 	for (let r = 0; r < e.length; r++) {
 		if (e[r] !== ",") continue;
@@ -264,7 +310,7 @@ function V(e) {
 	}
 	return t.push(e.slice(n).trim()), t.filter(Boolean);
 }
-function H(e) {
+function U(e) {
 	if (!e.rawResponse) return null;
 	let { body: t, contentType: n, statusCode: r, headers: i } = e.rawResponse, a = new Headers(i);
 	return a.set("Content-Type", n), new globalThis.Response(t, {
@@ -272,8 +318,8 @@ function H(e) {
 		headers: a
 	});
 }
-async function U({ rendered: e, template: t, manifest: r, root: i, distClientDir: a, isProduction: l, assetBase: d, scriptPolicy: f }) {
-	let p = H(e);
+async function W({ rendered: e, template: t, manifest: r, root: i, distClientDir: a, isProduction: l, assetBase: d, scriptPolicy: f }) {
+	let p = U(e);
 	if (p) return p;
 	if (e.redirect) return new globalThis.Response(null, {
 		status: e.redirect.statusCode,
@@ -288,42 +334,89 @@ async function U({ rendered: e, template: t, manifest: r, root: i, distClientDir
 		base: d
 	});
 	D && w(D, l);
-	let k = "";
-	if (e.islandData && e.islandData.length > 0 && (k = `<script type="application/json" id="_l5e_data_">${(0, g.default)(e.islandData, { isJSON: !0 })}<\/script>`), l && r) {
-		m = m.filter((e) => e.replace(/^\//, "") !== "src/client.global.ts"), h = h.filter((e) => !e.includes(".global."));
-		let e = /* @__PURE__ */ new Set(), t = /* @__PURE__ */ new Set();
-		function n(n) {
-			let i = r[n];
-			return i ? (i.css && i.css.forEach((t) => e.add(t)), i.imports && i.imports.forEach((n) => {
-				let i = r[n];
-				i?.file && t.add(i.file), i?.css && i.css.forEach((t) => e.add(t)), i?.imports && i.imports.forEach((n) => {
-					let i = r[n];
-					i?.file && t.add(i.file), i?.css && i.css.forEach((t) => e.add(t));
+	let O = "";
+	if (e.islandData && e.islandData.length > 0 && (O = `<script type="application/json" id="_l5e_data_">${(0, g.default)(e.islandData, { isJSON: !0 })}<\/script>`), l && r) {
+		let e, t;
+		if (f?.compact) {
+			let n = f.sharedScripts();
+			if (n.length > 1) throw Error("[l5e chunking] Compact build has more than one canonical shared root.");
+			if (n.length === 1) {
+				let t = await k(n, a, f, {
+					compact: !0,
+					name: "shared"
 				});
-			}), { file: i.file }) : { file: null };
+				if (!t.filename) throw Error("[l5e chunking] Compact shared bundle failed.");
+				e = s(d, t.filename);
+			}
+			let i = r["src/client.global.ts"];
+			if (i?.file) {
+				let n = await k([`/${i.file}`], a, f, {
+					compact: !0,
+					name: "global",
+					sharedUrl: e,
+					exportScripts: f.globalOwnedScripts()
+				});
+				if (!n.filename) throw Error("[l5e chunking] Compact global bundle failed.");
+				t = s(d, n.filename), T.push(t);
+			}
+		}
+		m = m.filter((e) => e.replace(/^\//, "") !== "src/client.global.ts"), h = h.filter((e) => !e.includes(".global."));
+		let i = /* @__PURE__ */ new Set(), o = /* @__PURE__ */ new Set(), c = /* @__PURE__ */ new Set();
+		function l(e) {
+			let t = r[e];
+			if (!t) return { file: null };
+			if (!c.has(e)) {
+				c.add(e);
+				for (let e of t.css || []) i.add(e);
+				for (let e of t.imports || []) {
+					let t = l(e);
+					t.file && o.add(t.file);
+				}
+			}
+			return { file: t.file };
 		}
-		let i = [];
+		let u = [];
 		for (let e of m) {
-			let { file: t } = n(e.replace(/^\//, ""));
-			t && i.push(`/${t}`);
+			let { file: t } = l(e.replace(/^\//, ""));
+			t && u.push(`/${t}`);
 		}
-		let o = [];
-		for (let t of h) {
-			let { file: r } = n(t.replace(/^\//, ""));
-			r && (o.push(`/${r}`), e.add(r));
+		let p = [];
+		for (let e of h) {
+			let { file: t } = l(e.replace(/^\//, ""));
+			t && (p.push(`/${t}`), i.add(t));
 		}
-		if (i.length > 0) {
-			let e = await O(i, a, f);
-			m = e.filename ? [s(d, e.filename)] : i.map((e) => s(d, e));
+		if (u.length > 0 || f?.compact && _.length > 0) {
+			let n = f?.compact ? _.flatMap((e) => {
+				let t = r[e.src];
+				return t?.file ? [{
+					key: e.key,
+					script: `/${t.file}`
+				}] : [];
+			}) : [], i = f?.compact ? Object.entries(r).find(([e]) => e.includes("l5e-compact-renderer"))?.[1]?.file : void 0;
+			if (f?.compact && n.length > 0 && !i) throw Error("[l5e chunking] Compact renderer entry is missing from the manifest.");
+			let o = await k(u, a, f, {
+				compact: f?.compact,
+				islands: n,
+				name: "bundle",
+				sharedUrl: e,
+				renderer: i ? `/${i}` : void 0,
+				globalUrl: t
+			});
+			m = o.filename ? [s(d, o.filename)] : u.map((e) => s(d, e));
 		}
-		if (o.length > 0) {
-			let e = await A(o, a);
+		if (i.size > 0) {
+			let e = await j([...i].map((e) => `/${e}`), a);
 			e.filename && (h = [s(d, e.filename)]);
 		}
-		let c = r["src/client.global.ts"];
-		if (c && (c.css && c.css.length > 0 && c.css.forEach((e) => {
+		i.clear();
+		let v = r["src/client.global.ts"];
+		l("src/client.global.ts");
+		for (let e of i) w(s(d, e), !0);
+		v && (v.css && v.css.length > 0 && v.css.forEach((e) => {
 			w(s(d, e), !0);
-		}), c.file && T.push(s(d, c.file))), _.length > 0) {
+		}), v.file && (f?.compact || T.push(s(d, v.file))));
+		for (let e of f?.compact ? [] : o) S += `<link rel="modulepreload" crossorigin href="${n(s(d, e))}">`;
+		if (_.length > 0 && !f?.compact) {
 			let e = {};
 			for (let t of _) {
 				let n = r[t.src];
@@ -334,22 +427,22 @@ async function U({ rendered: e, template: t, manifest: r, root: i, distClientDir
 		h.length > 0 && h.forEach((e) => w(e, !0));
 	}
 	l || [...new Set(h)].forEach((e) => w(e));
-	let j = [...T, ...m];
+	let A = [...T, ...m];
 	if (!l) {
 		let e = u.join(i, "src", "client.global.ts");
-		if (c(e) && (j = ["/src/client.global.ts", ...j]), j = [...new Set(j)], _.length > 0) {
+		if (c(e) && (A = ["/src/client.global.ts", ...A]), A = [...new Set(A)], _.length > 0) {
 			let e = {};
 			for (let t of _) e[t.key] = `/${t.src}`;
 			E = `<script>window.__L5E_ISLANDS__=${(0, g.default)(e)}<\/script>`;
 		}
 	}
-	let M = k + E + j.map((e) => `<script type="module" src="${e}"><\/script>`).join(""), P = e.lang ? N(t, e.lang) : t, F = e.rawHtml ? e.html || "" : P.replace("<!--app-head-->", () => (e.head ?? "") + S).replace("<!--app-html-->", () => e.html ?? "").replace("<!--app-scripts-->", () => M), I = new Headers({ "Content-Type": "text/html" }), L = [], R = [];
-	return y !== void 0 && (L.push(`max-age=${y}`), R.push(`max-age=${y}`)), b !== void 0 && R.push(`s-maxage=${b}`), x !== void 0 && R.push(`stale-while-revalidate=${x}`), (L.length > 0 || R.length > 0) && l && (L.push("public"), L.push("must-revalidate"), R.push("public"), I.set("Cache-Control", L.join(", ")), I.set("CDN-Cache-Control", R.join(", "))), process.env.NODE_ENV === "production" && (v = J(v)), I.set("Cache-Tag", ["global", ...v].join(",")), new globalThis.Response(F, {
+	let M = O + E + A.map((e) => `<script type="module" src="${e}"><\/script>`).join(""), N = e.lang ? P(t, e.lang) : t, F = e.rawHtml ? e.html || "" : N.replace("<!--app-head-->", () => (e.head ?? "") + S).replace("<!--app-html-->", () => e.html ?? "").replace("<!--app-scripts-->", () => M), I = new Headers({ "Content-Type": "text/html" }), L = [], R = [];
+	return y !== void 0 && (L.push(`max-age=${y}`), R.push(`max-age=${y}`)), b !== void 0 && R.push(`s-maxage=${b}`), x !== void 0 && R.push(`stale-while-revalidate=${x}`), (L.length > 0 || R.length > 0) && l && (L.push("public"), L.push("must-revalidate"), R.push("public"), I.set("Cache-Control", L.join(", ")), I.set("CDN-Cache-Control", R.join(", "))), process.env.NODE_ENV === "production" && (v = Y(v)), I.set("Cache-Tag", ["global", ...v].join(",")), new globalThis.Response(F, {
 		status: e.statusCode || 200,
 		headers: I
 	});
 }
-async function W(e = {}) {
+async function G(e = {}) {
 	let t = e.root || process.cwd(), n = e.base || "/", i = process.env.NODE_ENV === "production", o = e.externalizeIslandProps ?? !0, p = i ? await l.readFile(u.join(t, "./index.html"), "utf-8") : "", m = (await import("express")).default, h = e.app || m();
 	if (e.publicDir) {
 		let n = u.isAbsolute(e.publicDir) ? e.publicDir : u.join(t, e.publicDir);
@@ -357,15 +450,20 @@ async function W(e = {}) {
 	}
 	let g, _ = u.join(t, "./dist/client"), v = i ? JSON.parse(await l.readFile(u.join(_, ".vite/manifest.json"), "utf-8")) : void 0, y;
 	if (v) try {
-		y = M(v, _, n);
+		let e, t = u.join(_, ".vite/l5e-chunks.json");
+		c(t) && (e = JSON.parse(await l.readFile(t, "utf-8"))), y = N(v, _, n, e);
 	} catch (e) {
 		console.warn("[bundler] Invalid build manifest; serving original script entries.", e);
 	}
 	if (i) {
 		let e = (await import("compression")).default, t = (await import("sirv")).default;
-		h.use(e()), h.use(n, t(_, { extensions: [] })), h.get(s(n, "bundle-:hash.:ext"), async (e, t) => {
+		h.use(e()), h.use(n, t(_, { extensions: [] })), h.get([
+			s(n, "global-:hash.:ext"),
+			s(n, "bundle-:hash.:ext"),
+			s(n, "shared-:hash.:ext")
+		], async (e, t) => {
 			try {
-				let { hash: n, ext: r } = e.params, i = j(`bundle-${n}.${r}`);
+				let { hash: n, ext: r } = e.params, i = M(`${u.basename(e.path).split("-", 1)[0]}-${n}.${r}`);
 				if (!i) return t.status(404).send("Bundled file not found");
 				t.set({
 					"Content-Type": i.mimeType,
@@ -427,14 +525,14 @@ async function W(e = {}) {
 			if (!m || !m.handler) return r.status(404).send("Action not found");
 			let h = (m.method || "GET").toUpperCase();
 			if (e.method.toUpperCase() !== h) return r.status(405).set("Allow", h).send("Method Not Allowed");
-			let _ = u.join(t, "./dist/server/entry-server.js"), v = i ? await import(d(_).href) : await g.ssrLoadModule("@withl5e/l5e/entry-server"), { runInRenderContext: y } = await (i ? import(d(_).href) : g.ssrLoadModule("@withl5e/l5e/jsx-runtime")), { renderJsxToHtmlString: x } = await (i ? import(d(_).href) : g.ssrLoadModule("@withl5e/l5e")), S = {}, T = I(e), E = a({
+			let _ = u.join(t, "./dist/server/entry-server.js"), v = i ? await import(d(_).href) : await g.ssrLoadModule("@withl5e/l5e/entry-server"), { runInRenderContext: y } = await (i ? import(d(_).href) : g.ssrLoadModule("@withl5e/l5e/jsx-runtime")), { renderJsxToHtmlString: x } = await (i ? import(d(_).href) : g.ssrLoadModule("@withl5e/l5e")), S = {}, T = L(e), E = a({
 				request: T,
 				locals: S,
 				clientAddress: f.getClientIp(e) ?? void 0
 			}), D = await v.loadMiddleware?.();
-			await z(e, r, await (typeof D == "function" ? D : (e, t) => t())(E, async (t) => {
+			await B(e, r, await (typeof D == "function" ? D : (e, t) => t())(E, async (t) => {
 				let r = {
-					...L(e, R(t, E.request, E.url), n, S),
+					...R(e, z(t, E.request, E.url), n, S),
 					path: e.originalUrl,
 					body: e.body
 				}, i = await y(async () => {
@@ -458,14 +556,14 @@ async function W(e = {}) {
 				let e = await g.ssrLoadModule("@withl5e/l5e/entry-server");
 				h = e.render, b = e.loadMiddleware;
 			}
-			let S = await b?.(), C = typeof S == "function" ? S : (e, t) => t(), w = {}, T = I(e), E = a({
+			let S = await b?.(), C = typeof S == "function" ? S : (e, t) => t(), w = {}, T = L(e), E = a({
 				request: T,
-				requestInfo: L(e, T, n, w),
+				requestInfo: R(e, T, n, w),
 				locals: w,
 				clientAddress: f.getClientIp(e)
 			}), D = async (r) => {
-				let a = L(e, r, n, w), s = F(a.url, n);
-				return U({
+				let a = R(e, r, n, w), s = I(a.url, n);
+				return W({
 					rendered: await h(s, a, { externalizeIslandProps: o }),
 					template: m,
 					manifest: x,
@@ -476,10 +574,10 @@ async function W(e = {}) {
 					scriptPolicy: y
 				});
 			}, O = async (t) => {
-				let i = R(t, E.request, E.url);
-				return E.request = i, E.url = new URL(i.url), E.cookies = r(i.headers.get("cookie") ?? void 0), E.requestInfo = L(e, i, n, w), D(i);
+				let i = z(t, E.request, E.url);
+				return E.request = i, E.url = new URL(i.url), E.cookies = r(i.headers.get("cookie") ?? void 0), E.requestInfo = R(e, i, n, w), D(i);
 			};
-			E.rewrite = (e) => O(e), await z(e, s, await C(E, O));
+			E.rewrite = (e) => O(e), await B(e, s, await C(E, O));
 		} catch (e) {
 			g?.ssrFixStacktrace?.(e), console.error(e.stack), s.status(500).end(i ? "Internal Server Error" : e.stack);
 		}
@@ -488,10 +586,10 @@ async function W(e = {}) {
 		vite: g
 	};
 }
-async function G(e = {}) {
+async function K(e = {}) {
 	let t = e.port || 5173, n = (await import("express")).default, r = n();
 	e.setupApp && (console.log("setupApp"), await e.setupApp(r));
-	let { app: i } = await W({
+	let { app: i } = await G({
 		...e,
 		app: r
 	});
@@ -499,8 +597,8 @@ async function G(e = {}) {
 		console.log(`Server started at http://localhost:${t}`);
 	});
 }
-var K = 1e3;
-function q(e) {
+var q = 1e3;
+function J(e) {
 	if (e === "global") return "global";
 	let t = 0;
 	for (let n = 0; n < e.length; n++) {
@@ -509,10 +607,10 @@ function q(e) {
 	}
 	return Math.abs(t).toString(36).substring(0, 8);
 }
-function J(e) {
-	return (Array.isArray(e) ? e : [...e]).slice(0, K).map(q);
+function Y(e) {
+	return (Array.isArray(e) ? e : [...e]).slice(0, q).map(J);
 }
 //#endregion
-export { G as a, J as i, W as n, q as r, N as t };
+export { K as a, Y as i, G as n, J as r, P as t };
 
-//# sourceMappingURL=server-DXNRPyGJ.js.map
+//# sourceMappingURL=server-BOdEiJoN.js.map