evolit 0.1.0-alpha.6 → 0.1.0-alpha.8

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "evolit",
-  "version": "0.1.0-alpha.6",
+  "version": "0.1.0-alpha.8",
   "description": "A convention-driven application framework for LitSX and web components.",
   "type": "module",
   "packageManager": "yarn@4.10.3",

package/src/build.js

@@ -15,6 +15,7 @@ import {
   emitBundledClientAssets,
   emitHashedClientAssets,
   normalizeHydrationDataForClient,
+  resolveRouteClientImports,
   resolveSharedVendorModuleUrl,
   rewriteHydrationDataScript,
   rewriteServerAssetPlaceholders,
@@ -241,8 +242,11 @@ export async function buildProject(projectRoot) {
   );
   const ssrAdapter = createSsrAdapter({
     assetResolver,
-    async resolveAdditionalHead({ result }) {
-      const clientImports = Array.isArray(result.clientImports) ? result.clientImports : [];
+    async resolveAdditionalHead({ routeResult, result }) {
+      const clientImports = [
+        ...(Array.isArray(result.clientImports) ? result.clientImports : []),
+        ...resolveRouteClientImports(routeResult, projectRoot, clientAssets),
+      ];
       const urls = collectTransitiveAssetPreloads(clientImports, clientAssets);
       const styleUrls = collectTransitiveStyleUrls(clientImports, clientAssets);
 

package/src/client-assets.js

@@ -1776,6 +1776,28 @@ export function collectTransitiveAssetPreloads(publicUrls, assetManifest) {
   return discovered;
 }
 
+export function resolveRouteClientImports(routeResult, projectRoot, assetManifest) {
+  const normalizedManifest = normalizeClientAssetManifest(assetManifest);
+  if (!normalizedManifest) {
+    return [];
+  }
+
+  const routeModules = [
+    routeResult?.route?.page,
+    ...(routeResult?.route?.layouts ?? []),
+    routeResult?.boundaryModule,
+  ].filter((modulePath) => typeof modulePath === "string");
+
+  return [...new Set(routeModules.map((modulePath) => {
+    const relativePath = path.relative(projectRoot, modulePath).split(path.sep).join("/");
+    const extension = path.extname(relativePath);
+    const clientModule = extension
+      ? `${relativePath.slice(0, -extension.length)}.mjs`
+      : `${relativePath}.mjs`;
+    return normalizedManifest.byClientModule[clientModule] ?? null;
+  }).filter((publicUrl) => typeof publicUrl === "string"))];
+}
+
 export function collectTransitiveStyleUrls(publicUrls, assetManifest) {
   const normalizedManifest = normalizeClientAssetManifest(assetManifest);
   if (!normalizedManifest) {

package/src/deployment-runtime.js

@@ -12,6 +12,7 @@ import {
   getSharedOutputRoot,
   normalizeHydrationDataForClient,
   normalizeClientAssetManifest,
+  resolveRouteClientImports,
   resolveSharedVendorModuleUrl,
   resolveBrowserPackageAssetFilePath,
   rewriteHydrationDataScript,
@@ -233,8 +234,11 @@ export async function createRequestRenderer({ projectRoot, mode, assetManifest,
     assetResolver(moduleId) {
       return currentAssetResolver(moduleId);
     },
-    async resolveAdditionalHead({ result }) {
-      const clientImports = Array.isArray(result.clientImports) ? result.clientImports : [];
+    async resolveAdditionalHead({ routeResult, result }) {
+      const clientImports = [
+        ...(Array.isArray(result.clientImports) ? result.clientImports : []),
+        ...resolveRouteClientImports(routeResult, projectRoot, currentAssetManifest),
+      ];
       const urls = currentAssetManifest
         ? collectTransitiveAssetPreloads(clientImports, currentAssetManifest)
         : [];