@octanejs/app-core 0.0.36 → 0.0.38

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@octanejs/app-core",
-  "version": "0.0.36",
+  "version": "0.0.38",
   "license": "MIT",
   "type": "module",
   "engines": {
@@ -79,10 +79,10 @@
     "esbuild": "^0.28.1"
   },
   "peerDependencies": {
-    "octane": "0.1.40"
+    "octane": "0.1.42"
   },
   "devDependencies": {
     "@types/node": "^24.13.3",
-    "octane": "0.1.40"
+    "octane": "0.1.42"
   }
 }

package/src/server/production.js

@@ -296,21 +296,36 @@ export function createHandler(manifest, deps) {
 		});
 		const dataScript = `<script id="__octane_data" type="application/json"${nonceAttribute(nonce)}>${escapeScript(routeData)}</script>`;
 
-		// Per-route asset hints from the client manifest: stylesheet links so
-		// page CSS applies before hydration, modulepreload so the page chunk
-		// downloads in parallel with the hydrate entry (which the template's own
-		// script tag already references).
+		// The page, layout, and configured root fallbacks can all contribute
+		// server HTML before hydration. Their asset records also include CSS for
+		// deferred Hydrate descendants, whose JavaScript must remain lazy. Keep
+		// page CSS first, preserve each record's order, and link shared files once.
 		/** @type {string[]} */
 		const preloadTags = [];
-		const entryAssets = entryPath ? manifest.clientAssets?.[entryPath] : undefined;
-		if (entryAssets) {
-			for (const cssFile of entryAssets.css) {
-				preloadTags.push(`<link rel="stylesheet" href="/${cssFile}">`);
-			}
-			if (entryAssets.js) {
-				preloadTags.push(`<link rel="modulepreload" href="/${entryAssets.js}">`);
+		const clientAssets = manifest.clientAssets;
+		const entryAssets = entryPath ? clientAssets?.[entryPath] : undefined;
+		if (clientAssets) {
+			/** @type {Set<string>} */
+			const stylesheets = new Set();
+			for (const modulePath of [
+				entryPath,
+				route.layout,
+				manifest.rootBoundary?.pending ? manifest.rootBoundaryEntries?.pending?.path : undefined,
+				manifest.rootBoundary?.catch ? manifest.rootBoundaryEntries?.catch?.path : undefined,
+			]) {
+				if (!modulePath) continue;
+				for (const cssFile of clientAssets[modulePath]?.css ?? []) {
+					if (stylesheets.has(cssFile)) continue;
+					stylesheets.add(cssFile);
+					preloadTags.push(`<link rel="stylesheet" href="/${cssFile}">`);
+				}
 			}
 		}
+		// Only the page chunk was already eager; do not promote layout, fallback,
+		// or island JavaScript while making their server-rendered CSS available.
+		if (entryAssets?.js) {
+			preloadTags.push(`<link rel="modulepreload" href="/${entryAssets.js}">`);
+		}
 
 		const headContent = [...preloadTags, dataScript].join('\n');
 		const noncedTemplate = applyHydrationNonce(htmlTemplate, nonce);