@withl5e/l5e 1.0.1 → 1.1.0-alpha.0

package/dist/vite-plugin.js

@@ -1,333 +1,2 @@
-import { t as e } from "./global-style-Cgno-yNl.js";
-import { existsSync as t, mkdirSync as n, readFileSync as r, readdirSync as i, rmSync as a, statSync as o, writeFileSync as s } from "fs";
-import { transform as c } from "esbuild";
-import { dirname as l, join as u, relative as d, resolve as f } from "path";
-//#region src/core/vite-plugin.ts
-var p = "virtual:l5e-views", m = "virtual:l5e-route", h = "virtual:l5e-ssr-entry", g = "virtual:l5e-global-loader", _ = "virtual:l5e-island-strategies", v = "virtual:l5e-islands", y = "virtual:l5e-actions", b = "virtual:l5e-middleware", x = /* @__PURE__ */ new Set([
-	"MODE",
-	"BASE_URL",
-	"PROD",
-	"DEV",
-	"SSR",
-	"LEGACY"
-]);
-function S(e, t = []) {
-	let n = i(e);
-	for (let r of n) {
-		let n = u(e, r);
-		if (o(n).isDirectory()) {
-			if (r === "node_modules" || r === "dist" || r === ".git") continue;
-			S(n, t);
-		} else (r.endsWith(".tsx") || r.endsWith(".ts")) && t.push(n);
-	}
-	return t;
-}
-function C(e) {
-	let t = 0;
-	for (let n = 0; n < e.length; n++) t = (t << 5) - t + e.charCodeAt(n), t &= t;
-	return Math.abs(t).toString(16).slice(0, 4);
-}
-function w(e) {
-	let t = e.split("/"), n = t[t.length - 1];
-	return n = n.replace(/\.(tsx?|jsx?)$/, ""), n;
-}
-function T(e) {
-	return `${w(e)}_${C(e)}`;
-}
-function E(e, n) {
-	let r = e.replace(/^\//, ""), i = f(n, r);
-	for (let e of [
-		".tsx",
-		".ts",
-		".jsx",
-		".js"
-	]) if (t(i + e)) return r + e;
-	return t(i) ? r : null;
-}
-function D(e, t) {
-	let n = r(e, "utf-8"), i = [], a = /<ClientIsland\s[^>]*?from\s*=\s*"([^"]+)"/g, o = /* @__PURE__ */ new Set(), s;
-	for (; (s = a.exec(n)) !== null;) {
-		let n = s[1], r;
-		if (n.startsWith("~/")) r = "/src/" + n.substring(2);
-		else if (n.startsWith("/src/")) r = n;
-		else if (n.startsWith("./") || n.startsWith("../")) {
-			let i = f(e, "..", n);
-			r = "/" + d(t, i).replace(/\\/g, "/");
-		} else r = n;
-		let a = E(r, t);
-		if (!a) {
-			console.warn(`[l5e] Island component not found: ${r} (from ${n} in ${e})`);
-			continue;
-		}
-		let c = T(r);
-		o.has(c) || (o.add(c), i.push({
-			component: w(r),
-			resolvedPath: r,
-			src: a,
-			key: c
-		}));
-	}
-	return i;
-}
-function O(e, t) {
-	let n = r(e, "utf-8"), i = [], a = [], o = /useCss\s*\(\s*['"]([^'"]+)['"]\s*,?\s*\)/g, s = /useClientJs\s*\(\s*['"]([^'"]+)['"]\s*,?\s*\)/g, c;
-	for (; (c = o.exec(n)) !== null;) {
-		let n = c[1];
-		if (n.startsWith("/src/")) i.push(n);
-		else if (n.startsWith("./") || n.startsWith("../")) {
-			let r = f(e, "..", n), a = "/" + d(t, r).replace(/\\/g, "/");
-			i.push(a);
-		} else i.push(n);
-	}
-	for (; (c = s.exec(n)) !== null;) {
-		let n = c[1];
-		if (n.startsWith("/src/")) a.push(n);
-		else if (n.startsWith("./") || n.startsWith("../")) {
-			let r = f(e, "..", n), i = "/" + d(t, r).replace(/\\/g, "/");
-			a.push(i);
-		} else a.push(n);
-	}
-	return {
-		css: i,
-		js: a
-	};
-}
-function k(n) {
-	let i = {}, a = u(n, "src"), s = /* @__PURE__ */ new Map(), c = /* @__PURE__ */ new Map(), p = /* @__PURE__ */ new Map(), m = /* @__PURE__ */ new Map();
-	try {
-		if (!o(a).isDirectory()) return {
-			input: i,
-			islandRegistry: s,
-			pathToKey: c,
-			keyToSrc: p,
-			actionRegistry: m
-		};
-		let h = u(n, "src", "client.global.ts");
-		t(h) && (i.global = h, console.log("[l5e] Detected src/client.global.ts and added as entry"));
-		let g = e(n);
-		g && (i["global-style"] = g, console.log("[l5e] Detected src/global.css and added as global stylesheet"));
-		let _ = S(a), v = /* @__PURE__ */ new Set(), y = /* @__PURE__ */ new Set();
-		for (let e of _) {
-			let { css: t, js: i } = O(e, n);
-			t.forEach((e) => v.add(e)), i.forEach((e) => y.add(e));
-			let o = D(e, n);
-			for (let e of o) s.set(e.key, e.resolvedPath), c.set(e.resolvedPath, e.key), p.set(e.key, e.src);
-			let u = e.replace(/\\/g, "/");
-			if (/\/actions\.(ts|tsx)$/.test(u)) {
-				let t = r(e, "utf-8"), n = /export\s+const\s+(\w+)\s*=\s*defineAction\s*\(/g, i, o = d(a, l(e)).replace(/\\/g, "/") || ".";
-				for (; (i = n.exec(t)) !== null;) {
-					let e = i[1], t = `${e}_${C(o)}`;
-					m.set(t, {
-						modulePath: o,
-						actionName: e
-					});
-				}
-			}
-		}
-		for (let e of v) {
-			let r = e.startsWith("/src/") || e.startsWith("/") ? e.substring(1) : e, a = f(n, r);
-			if (g && f(a) === f(g)) continue;
-			if (!t(a)) {
-				console.warn(`[l5e] CSS file not found: ${a} (from ${e})`);
-				continue;
-			}
-			let o = r.replace(/^src\//, "").replace(/\.css$/, "").replace(/\//g, "-").replace(/\\/g, "-");
-			i[o] = a;
-		}
-		for (let e of y) {
-			let r = e.startsWith("/src/") || e.startsWith("/") ? e.substring(1) : e, a = f(n, r);
-			if (!t(a)) {
-				console.warn(`[l5e] JS/TS file not found: ${a} (from ${e})`);
-				continue;
-			}
-			let o = r.replace(/^src\//, "").replace(/\.(ts|tsx|js|jsx)$/, "").replace(/\//g, "-").replace(/\\/g, "-");
-			i[o] = a;
-		}
-		for (let [e, t] of p) {
-			let r = f(n, t);
-			i[`island-${e}`] = r;
-		}
-		s.size > 0 && console.log(`[l5e] Detected ${s.size} island(s)`), m.size > 0 && console.log(`[l5e] Detected ${m.size} action(s)`);
-	} catch (e) {
-		console.warn("[l5e] Failed to discover bundler input:", e);
-	}
-	return {
-		input: i,
-		islandRegistry: s,
-		pathToKey: c,
-		keyToSrc: p,
-		actionRegistry: m
-	};
-}
-function A(e, t, n, r, i) {
-	let a = [], o = 0, s = /ClientIsland\s*,\s*\{/g, c;
-	for (; (c = s.exec(e)) !== null;) {
-		let s = c.index + c[0].length, l = e.substring(s, s + 500), u = /from:\s*"([^"]+)"/.exec(l);
-		if (!u) continue;
-		let p = u[1], m;
-		if (p.startsWith("~/")) m = "/src/" + p.substring(2);
-		else if (p.startsWith("/src/")) m = p;
-		else if (p.startsWith("./") || p.startsWith("../")) {
-			let e = f(t, "..", p);
-			m = "/" + d(n, e).replace(/\\/g, "/");
-		} else m = p;
-		let h = r.get(m);
-		if (!h) continue;
-		let g = i.get(h);
-		if (!g) continue;
-		let _ = s + u.index + u[0].length;
-		a.push(e.substring(o, _)), a.push(`, __key: "${h}", __src: "${g}"`), o = _;
-	}
-	return a.push(e.substring(o)), a.join("");
-}
-function j() {
-	let e = process.cwd(), r = /* @__PURE__ */ new Map(), i = /* @__PURE__ */ new Map(), o = /* @__PURE__ */ new Map();
-	return {
-		name: "l5e-jsx-classic",
-		enforce: "pre",
-		configResolved(t) {
-			e = t.root || process.cwd();
-		},
-		handleHotUpdate({ file: t, server: n }) {
-			let r = d(e, t);
-			if (/actions\.(ts|tsx)$/.test(t)) {
-				o = k(e).actionRegistry;
-				let t = n.moduleGraph.getModuleById("\0virtual:l5e-actions");
-				t && n.moduleGraph.invalidateModule(t), console.log(`[l5e] Action file changed: ${r} — re-scanned ${o.size} action(s)`);
-			}
-			if (t.endsWith(".css")) {
-				console.log(`[l5e] CSS changed: ${r} - using Vite HMR`);
-				return;
-			}
-			if (t.includes("client.ts")) {
-				console.log(`[l5e] Client JS changed: ${r} - using Vite HMR`);
-				return;
-			}
-			if (t.includes("/src/") || t.includes("\\src\\")) return console.log(`[l5e] SSR file changed: ${r} - triggering full reload`), n.ws.send({
-				type: "full-reload",
-				path: "*"
-			}), [];
-		},
-		buildEnd() {
-			let n = u(e, ".l5e-temp");
-			if (t(n)) try {
-				a(n, {
-					recursive: !0,
-					force: !0
-				}), console.log("[l5e] Cleaned up temporary files");
-			} catch (e) {
-				console.warn("[l5e] Failed to cleanup temporary files:", e);
-			}
-		},
-		writeBundle(r, i) {
-			if (o.size > 0) {
-				let r = u(e, "dist", "server");
-				t(r) || n(r, { recursive: !0 });
-				let i = Object.fromEntries(o);
-				s(u(r, "action-registry.json"), JSON.stringify(i), "utf-8"), console.log(`[l5e] Wrote action-registry.json (${o.size} actions)`);
-			}
-		},
-		config(e) {
-			let t = k(e.root || process.cwd());
-			t.islandRegistry, r = t.pathToKey, i = t.keyToSrc, o = t.actionRegistry;
-			let n = e.build?.rolldownOptions?.input || {}, a = typeof n == "object" && !Array.isArray(n) ? {
-				...t.input,
-				...n
-			} : t.input;
-			return { build: { rolldownOptions: {
-				...e.build?.rolldownOptions,
-				input: Object.keys(a).length > 0 ? a : void 0,
-				preserveEntrySignatures: "exports-only"
-			} } };
-		},
-		resolveId(e) {
-			return e === p ? "\0virtual:l5e-views" : e === m ? "\0virtual:l5e-route" : e === h ? "\0virtual:l5e-ssr-entry" : e === g ? "\0virtual:l5e-global-loader" : e === _ ? "\0virtual:l5e-island-strategies" : e === v ? "\0virtual:l5e-islands" : e === y ? "\0virtual:l5e-actions" : e === b ? "\0virtual:l5e-middleware" : null;
-		},
-		async transform(t, n, a) {
-			if (n.replace(/\\/g, "/").endsWith("src/client.global.ts") && !a?.ssr) return {
-				code: `import '@withl5e/l5e/island/runtime';\n${t}`,
-				map: null
-			};
-			if (!a?.ssr) {
-				let e = n.replace(/\\/g, "/").match(/\/src\/(.+)\/actions\.(ts|tsx)$/);
-				if (e) {
-					let n = e[1], r = /export\s+const\s+(\w+)\s*=\s*defineAction\s*\(/g, i = [], a;
-					for (; (a = r.exec(t)) !== null;) {
-						let e = a[1], n = t.substring(a.index, a.index + 500).match(/method:\s*['"](\w+)['"]/), r = n ? n[1].toUpperCase() : "GET";
-						i.push({
-							name: e,
-							method: r
-						});
-					}
-					if (i.length > 0) return {
-						code: i.map(({ name: e, method: t }) => {
-							let r = `${e}_${C(n)}`;
-							return t === "GET" ? `export async function ${e}(params) {
-  const res = await fetch('/_l5e/action/${r}?' + new URLSearchParams(params));
-  if (!res.ok) throw Object.assign(new Error('HTTP ' + res.status), { status: res.status });
-  return res;
-}` : `export async function ${e}(body) {
-  const res = await fetch('/_l5e/action/${r}', {
-    method: '${t}',
-    headers: { 'Content-Type': 'application/json' },
-    body: JSON.stringify(body),
-  });
-  if (!res.ok) throw Object.assign(new Error('HTTP ' + res.status), { status: res.status });
-  return res;
-}`;
-						}).join("\n\n"),
-						map: null
-					};
-				}
-			}
-			if (n.includes("node_modules") || n.includes("/react/") || n.includes("\\react\\")) return null;
-			if (/\.(tsx|jsx)$/.test(n)) try {
-				let a = `import { Fragment as __Fragment, jsxFactory } from "@withl5e/l5e/jsx-runtime"\n${t}`, o = await c(a, {
-					loader: n.endsWith(".tsx") ? "tsx" : "jsx",
-					jsx: "transform",
-					jsxFactory: "jsxFactory",
-					jsxFragment: "__Fragment",
-					sourcemap: !0,
-					sourcefile: n,
-					target: "es2020"
-				}), s = o.code;
-				return s.includes("ClientIsland") && (s = A(s, n, e, r, i)), {
-					code: s,
-					map: o.map || null
-				};
-			} catch (e) {
-				throw console.error(`[l5e] Failed to transform JSX in ${n}:`, e), e;
-			}
-			if (a?.ssr) {
-				let e = t, n = !1;
-				if (e = e.replace(/import\.meta\.env\.([a-zA-Z_][a-zA-Z0-9_]*)/g, (e, t) => x.has(t) ? e : (n = !0, `process.env.${t}`)), e = e.replace(/import\.meta\.env\[(['"`])([^'"`]+)\1\]/g, (e, t, r) => x.has(r) ? e : (n = !0, `process.env[${t}${r}${t}]`)), n) return {
-					code: e,
-					map: null
-				};
-			}
-			return null;
-		},
-		load(n) {
-			if (n === "\0virtual:l5e-views") return "\nexport const viewLoaders = import.meta.glob('/src/views/*/loader.{ts,tsx}');\nexport const viewComponents = import.meta.glob('/src/views/*/index.tsx');\n";
-			if (n === "\0virtual:l5e-route") return "export default function routeHandler(requestInfo) {\n  return import('/src/route.ts').then((mod) => mod.default(requestInfo));\n}";
-			if (n === "\0virtual:l5e-ssr-entry") return "export { render } from '@withl5e/l5e/entry-server';\nexport { viewActions } from 'virtual:l5e-actions';";
-			if (n === "\0virtual:l5e-global-loader") return "export const globalLoader = import.meta.glob('/src/global-loader.{ts,tsx}', { eager: false });";
-			if (n === "\0virtual:l5e-actions") {
-				let e = Object.fromEntries(o);
-				return `export const viewActions = import.meta.glob('/src/**/actions.{ts,tsx}');
-export const actionRegistry = ${JSON.stringify(e)};`;
-			}
-			if (n === "\0virtual:l5e-middleware") return "\nconst middlewareModules = import.meta.glob([\n  '/src/middleware.{ts,tsx,js,jsx}',\n  '/src/middleware/index.{ts,tsx,js,jsx}',\n]);\n\nconst middlewarePaths = [\n  '/src/middleware.ts',\n  '/src/middleware.tsx',\n  '/src/middleware.js',\n  '/src/middleware.jsx',\n  '/src/middleware/index.ts',\n  '/src/middleware/index.tsx',\n  '/src/middleware/index.js',\n  '/src/middleware/index.jsx',\n];\n\nexport async function loadMiddleware() {\n  const middlewarePath = middlewarePaths.find((path) => middlewareModules[path]);\n  if (!middlewarePath) return undefined;\n\n  const mod = await middlewareModules[middlewarePath]();\n  return mod.onRequest;\n}\n";
-			if (n === "\0virtual:l5e-islands") return "export const islandModules = import.meta.glob('/src/**/react/*.{tsx,jsx}');";
-			if (n === "\0virtual:l5e-island-strategies") {
-				let n = u(e, "src", "island-strategies.ts");
-				return t(n) ? "import '/src/island-strategies.ts';" : "/* no custom island strategies */";
-			}
-			return null;
-		}
-	};
-}
-//#endregion
-export { j as coreVite, j as default };
-
-//# sourceMappingURL=vite-plugin.js.map
+import { t as e } from "./vite-plugin-D9qTnleZ.js";
+export { e as coreVite, e as default };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@withl5e/l5e",
-  "version": "1.0.1",
+  "version": "1.1.0-alpha.0",
   "description": "HTML-first SSR MPA framework with loaders, middleware, islands, actions, swap, SEO and cache controls.",
   "type": "module",
   "license": "MIT",

package/src/core/bundler.ts

@@ -216,7 +216,7 @@ export async function bundleScripts(
     return EMPTY_RESULT;
   }
 
-  const uniquePaths = [...new Set(scriptPaths)].sort();
+  const uniquePaths = [...new Set(scriptPaths)];
   const cacheKey = `scripts:${policy.cacheKey}:${JSON.stringify(uniquePaths)}`;
 
   try {

package/src/core/chunking.ts

@@ -0,0 +1,199 @@
+import { createHash } from 'node:crypto';
+import path from 'node:path';
+import type { CodeSplittingGroup, ModuleInfo, OutputBundle } from 'rolldown';
+
+export interface SharedChunkGroup {
+  name: string;
+  /** Exact package names, including their subpath imports. */
+  packages?: string[];
+  /** Module specifiers resolved by Vite, including aliases. */
+  modules?: string[];
+  priority?: number;
+  /** Approximate uncompressed maximum; not a hard network byte budget. */
+  maxSize?: number;
+}
+
+export interface ChunkingOptions {
+  shared?: SharedChunkGroup[];
+}
+
+export interface CoreViteOptions {
+  /** false leaves chunk placement to Vite; runtime identity protection stays enabled. */
+  chunking?: ChunkingOptions | false;
+}
+
+const normalize = (id: string) => id.replace(/\\/g, '/');
+const digest = (value: string) => createHash('sha256').update(value).digest('hex').slice(0, 8);
+
+/** The last node_modules segment also handles pnpm's nested package layout. */
+function packageName(id: string): string | undefined {
+  const suffix = normalize(id).split('/node_modules/').at(-1);
+  if (suffix === normalize(id)) return undefined;
+  const parts = suffix!.split('/');
+  return parts[0].startsWith('@') ? parts.slice(0, 2).join('/') : parts[0];
+}
+
+type Decision = { group: string | null; rule?: string; consumers: string[]; reason: string };
+
+/** One build-time plan drives placement and the diagnostic report. Runtime reads Vite's manifest. */
+export function createChunkPlanner(options: ChunkingOptions = {}) {
+  const rules = options.shared || [];
+  const names = new Set<string>();
+  for (const rule of rules) {
+    if (!/^[a-zA-Z0-9][a-zA-Z0-9_-]*$/.test(rule.name) || names.has(rule.name)) {
+      throw new Error(`[l5e chunking] Invalid or duplicate shared group: ${rule.name}`);
+    }
+    if (!rule.packages?.length && !rule.modules?.length) {
+      throw new Error(`[l5e chunking] Group ${rule.name} needs packages or modules.`);
+    }
+    if (rule.maxSize !== undefined && (!Number.isFinite(rule.maxSize) || rule.maxSize <= 0)) {
+      throw new Error(`[l5e chunking] Invalid maxSize for ${rule.name}`);
+    }
+    names.add(rule.name);
+  }
+  let root = '';
+  const resolvedRules = new Map<SharedChunkGroup, Set<string>>();
+  const decisions = new Map<string, Decision>();
+  const warnings = new Set<string>();
+  const portable = (id: string) => {
+    const pkg = packageName(id);
+    if (pkg) return `npm:${normalize(id).split('/node_modules/').at(-1)}`;
+    return normalize(path.relative(root, id));
+  };
+
+  return {
+    async resolve(
+      projectRoot: string,
+      resolveId: (id: string, importer: string) => Promise<string | null>,
+    ) {
+      root = projectRoot;
+      resolvedRules.clear();
+      decisions.clear();
+      warnings.clear();
+      for (const rule of rules) {
+        const ids = new Set<string>();
+        for (const specifier of rule.modules || []) {
+          const id = await resolveId(specifier, path.join(root, 'index.html'));
+          if (!id) throw new Error(`[l5e chunking] Cannot resolve ${specifier} in ${rule.name}`);
+          ids.add(id);
+        }
+        resolvedRules.set(rule, ids);
+      }
+    },
+    analyze(modules: ModuleInfo[]) {
+      decisions.clear();
+      const graph = new Map(modules.map((mod) => [mod.id, mod]));
+      const roots = modules.filter((mod) => mod.isEntry || mod.dynamicImporters.length > 0);
+      const consumers = new Map<string, Set<string>>();
+      for (const entry of roots) {
+        const visited = new Set<string>();
+        const visit = (id: string) => {
+          if (visited.has(id)) return;
+          visited.add(id);
+          const mod = graph.get(id);
+          if (!mod) return;
+          const users = consumers.get(id) || new Set<string>();
+          users.add(entry.id);
+          consumers.set(id, users);
+          mod.importedIds.forEach(visit);
+        };
+        visit(entry.id);
+      }
+      const rank = (id: string) => {
+        const mod = graph.get(id)!;
+        if (!mod.isEntry) return 3;
+        if (normalize(id).endsWith('/src/client.global.ts')) return 0;
+        if (/\/react\//.test(normalize(id)) && !packageName(id)) return 2;
+        return 1;
+      };
+      const matched = new Set<SharedChunkGroup>();
+      for (const mod of modules) {
+        const users = [...(consumers.get(mod.id) || [])].sort();
+        const labels = users.map(portable).sort();
+        const matches = rules
+          .filter(
+            (rule) =>
+              resolvedRules.get(rule)?.has(mod.id) ||
+              rule.packages?.includes(packageName(mod.id) || ''),
+          )
+          .sort((a, b) => (b.priority || 0) - (a.priority || 0));
+        matches.forEach((rule) => matched.add(rule));
+        if (matches.length > 1)
+          warnings.add(
+            `${portable(mod.id)} matches ${matches.map((r) => r.name).join(', ')}; using ${matches[0].name}.`,
+          );
+        let group: string | null = null;
+        let reason = 'Private dependency stays with its entry or dynamic import.';
+        if (!mod.isEntry && users.length && matches.length) {
+          // Explicit groups can combine consumers at the same activation tier.
+          // Never promote island-only code into global/page, or dynamic-only code
+          // into a static entry. Distinct dynamic roots remain separate as well.
+          const tier = Math.min(...users.map(rank));
+          const activation =
+            tier === 3
+              ? `lazy-${digest(JSON.stringify(labels))}`
+              : ['global', 'page', 'island'][tier];
+          group = `shared-${matches[0].name}-${activation}`;
+          reason = `Configured group ${matches[0].name}; activation ${activation}.`;
+        } else if (!mod.isEntry && users.length > 1) {
+          group = `shared-auto-${digest(JSON.stringify(labels))}`;
+          reason = 'Shared by the same static consumers; preserves dynamic import roots.';
+        }
+        decisions.set(mod.id, { group, rule: matches[0]?.name, consumers: labels, reason });
+      }
+      for (const rule of rules) {
+        if (!matched.has(rule))
+          warnings.add(`Group ${rule.name} matched no modules in this client build.`);
+      }
+      return [...warnings];
+    },
+    groups(): CodeSplittingGroup[] {
+      return [
+        ...rules.map((rule) => ({
+          name: (id: string) => {
+            const decision = decisions.get(id);
+            return decision?.rule === rule.name ? decision.group : null;
+          },
+          maxSize: rule.maxSize,
+          includeDependenciesRecursively: false,
+        })),
+        {
+          name: (id: string) => decisions.get(id)?.group || null,
+          includeDependenciesRecursively: false,
+        },
+      ];
+    },
+    report(bundle: OutputBundle) {
+      return {
+        version: 1,
+        warnings: [...warnings],
+        chunks: Object.values(bundle).flatMap((chunk) => {
+          if (chunk.type !== 'chunk') return [];
+          const source = chunk.facadeModuleId ? portable(chunk.facadeModuleId) : null;
+          const kind =
+            source === 'src/client.global.ts'
+              ? 'global'
+              : source && /(?:^|\/)react\//.test(source)
+                ? 'island'
+                : chunk.isEntry || chunk.isDynamicEntry
+                  ? 'page'
+                  : 'shared';
+          return [
+            {
+              file: chunk.fileName,
+              kind,
+              source,
+              bytes: Buffer.byteLength(chunk.code),
+              imports: chunk.imports,
+              dynamicImports: chunk.dynamicImports,
+              modules: Object.keys(chunk.modules).map((id) => ({
+                id: portable(id),
+                ...decisions.get(id),
+              })),
+            },
+          ];
+        }),
+      };
+    },
+  };
+}

package/src/core/server.ts

@@ -289,28 +289,18 @@ async function createPageResponse({
     const cssFiles = new Set<string>();
     const preloadFiles = new Set<string>();
 
+    const visitedEntries = new Set<string>();
     function collectFromEntry(entryKey: string): { file: string | null } {
       const entry = manifest![entryKey];
       if (!entry) return { file: null };
-
-      if (entry.css) entry.css.forEach((css: string) => cssFiles.add(css));
-      if (entry.imports) {
-        entry.imports.forEach((importKey: string) => {
-          const importedChunk = manifest![importKey];
-          if (importedChunk?.file) preloadFiles.add(importedChunk.file);
-          if (importedChunk?.css) {
-            importedChunk.css.forEach((css: string) => cssFiles.add(css));
-          }
-          if (importedChunk?.imports) {
-            importedChunk.imports.forEach((key: string) => {
-              const chunk = manifest![key];
-              if (chunk?.file) preloadFiles.add(chunk.file);
-              if (chunk?.css) chunk.css.forEach((css: string) => cssFiles.add(css));
-            });
-          }
-        });
+      if (!visitedEntries.has(entryKey)) {
+        visitedEntries.add(entryKey);
+        for (const css of entry.css || []) cssFiles.add(css);
+        for (const key of entry.imports || []) {
+          const dependency = collectFromEntry(key);
+          if (dependency.file) preloadFiles.add(dependency.file);
+        }
       }
-
       return { file: entry.file };
     }
 
@@ -338,14 +328,20 @@ async function createPageResponse({
         : mappedScripts.map((file) => withAssetBase(assetBase, file));
     }
 
-    if (mappedCssFiles.length > 0) {
-      const bundledCss = await bundleCss(mappedCssFiles, distClientDir);
+    if (cssFiles.size > 0) {
+      const bundledCss = await bundleCss(
+        [...cssFiles].map((file) => `/${file}`),
+        distClientDir,
+      );
       if (bundledCss.filename) {
         cssSrcList = [withAssetBase(assetBase, bundledCss.filename)];
       }
     }
 
+    cssFiles.clear();
     const globalEntry = manifest['src/client.global.ts'];
+    collectFromEntry('src/client.global.ts');
+    for (const cssFile of cssFiles) appendStylesheet(withAssetBase(assetBase, cssFile), true);
     if (globalEntry) {
       if (globalEntry.css && globalEntry.css.length > 0) {
         globalEntry.css.forEach((cssFile: string) => {
@@ -357,6 +353,10 @@ async function createPageResponse({
       }
     }
 
+    for (const file of preloadFiles) {
+      extraHead += `<link rel="modulepreload" crossorigin href="${escapeProp(withAssetBase(assetBase, file))}">`;
+    }
+
     if (islandEntries.length > 0) {
       const islandMap: Record<string, string> = {};
       for (const island of islandEntries) {