@jay-framework/production-server 0.22.1 → 0.23.0

package/dist/index.d.ts

@@ -1,5 +1,5 @@
-import { B as BuildOptions, R as RouteManifest, a as RouteEntry } from './serve-index-lg6huJYm.js';
-export { A as ActionEntry, e as ArtifactStore, c as BuildMetadata, C as CacheEntry, F as FilesystemArtifactStore, I as InstanceEntry, M as MatchResult, d as PageModule, P as PluginEntry, n as PreImportedPlugin, b as RouteSegment, S as ServerElementModule, g as fetchActionRequest, f as fetchPageRequest, j as fetchStaticFile, k as initializeServices, l as initializeServicesFromModules, i as isActionRequest, m as matchRequest, r as registerActionsFromManifest, h as registerActionsFromModules } from './serve-index-lg6huJYm.js';
+import { B as BuildOptions, R as RouteManifest, a as RouteEntry } from './serve-index-XSavezh8.js';
+export { A as ActionEntry, e as ArtifactStore, c as BuildMetadata, C as CacheEntry, F as FilesystemArtifactStore, I as InstanceEntry, M as MatchResult, d as PageModule, P as PluginEntry, n as PreImportedPlugin, b as RouteSegment, S as ServerElementModule, g as fetchActionRequest, f as fetchPageRequest, j as fetchStaticFile, k as initializeServices, l as initializeServicesFromModules, i as isActionRequest, m as matchRequest, r as registerActionsFromManifest, h as registerActionsFromModules } from './serve-index-XSavezh8.js';
 import '@jay-framework/ssr-runtime';
 import '@jay-framework/compiler-shared';
 import '@jay-framework/stack-server-runtime';

package/dist/index.js

@@ -6,8 +6,8 @@ import path from "node:path";
 import fs from "node:fs/promises";
 import { createRequire } from "node:module";
 import { DevSlowlyChangingPhase, slowRenderInstances, scanPlugins, runLoadParams, parseCookies } from "@jay-framework/stack-server-runtime";
-import { l as loadProductionPageParts, g as buildPagePartsConfig, d as initializeServices, r as registerActionsFromManifest, i as isActionRequest, a as fetchActionRequest, c as fetchStaticFile, m as matchRequest, f as fetchPageRequest, F as FilesystemArtifactStore } from "./init-services-zmGSxSck.js";
-import { e, b } from "./init-services-zmGSxSck.js";
+import { l as loadProductionPageParts, g as buildPagePartsConfig, d as initializeServices, r as registerActionsFromManifest, i as isActionRequest, a as fetchActionRequest, c as fetchStaticFile, m as matchRequest, f as fetchPageRequest, F as FilesystemArtifactStore } from "./init-services-AtDV4X1i.js";
+import { e, b } from "./init-services-AtDV4X1i.js";
 import crypto, { createHash } from "node:crypto";
 import fs$1 from "node:fs";
 import { jayRuntime } from "@jay-framework/vite-plugin";
@@ -250,31 +250,27 @@ async function buildInstance(route, params, pageModule, ctx, routeServerElementP
     ])
   ];
   const pagePartsConfigPath = path.join(backendInstanceDir, "page-parts.json");
-  try {
-    await fs.access(pagePartsConfigPath);
-  } catch {
-    const exportName = route.componentExport || "page";
-    let pageServerModule = "";
-    let pageIsPlugin = false;
-    if (route.compPath) {
-      if (route.componentExport) {
-        pageServerModule = route.packageName || route.compPath;
-        pageIsPlugin = true;
-      } else {
-        const relativePath = path.relative(ctx.projectRoot, route.compPath);
-        pageServerModule = relativePath.replace(/^src\//, "server/").replace(/\.ts$/, ".js").replace(/\[/g, "_").replace(/\]/g, "_");
-      }
+  const exportName = route.componentExport || "page";
+  let pageServerModule = "";
+  let pageIsPlugin = false;
+  if (route.compPath) {
+    if (route.componentExport) {
+      pageServerModule = route.packageName || route.compPath;
+      pageIsPlugin = true;
+    } else {
+      const relativePath = path.relative(ctx.projectRoot, route.compPath);
+      pageServerModule = relativePath.replace(/^src\//, "server/").replace(/\.ts$/, ".js").replace(/\[/g, "_").replace(/\]/g, "_");
     }
-    const config = buildPagePartsConfig(
-      pageParts,
-      pageServerModule,
-      exportName,
-      ctx.backendDir,
-      pageIsPlugin
-    );
-    await fs.writeFile(pagePartsConfigPath, JSON.stringify(config, null, 2));
-    logger.info(`[Build] Page parts config: ${routeDir}/page-parts.json`);
   }
+  const config = buildPagePartsConfig(
+    pageParts,
+    pageServerModule,
+    exportName,
+    ctx.backendDir,
+    pageIsPlugin
+  );
+  await fs.writeFile(pagePartsConfigPath, JSON.stringify(config, null, 2));
+  logger.info(`[Build] Page parts config: ${routeDir}/page-parts.json`);
   const slowPhase = new DevSlowlyChangingPhase();
   const slowResult = await slowPhase.runSlowlyForPage(
     params,
@@ -377,7 +373,8 @@ function buildRouteEntry(route, serverModulePath) {
     segments: convertSegments(route.segments),
     serverModule: serverModulePath,
     componentExport: route.componentExport,
-    instances: []
+    instances: [],
+    ...route.devOnly && { devOnly: true }
   };
 }
 async function discoverActions(actionPaths, serverOutputDir, buildDir, projectRoot) {
@@ -467,9 +464,12 @@ async function scanPluginRoutes(projectRoot, projectRoutes) {
         jayHtmlPath,
         compPath,
         componentExport,
-        packageName: plugin.packageName
+        packageName: plugin.packageName,
+        ...route.devOnly === true && { devOnly: true }
       });
-      logger.info(`[Routes] Plugin "${plugin.manifest.name}" provides route ${route.path}`);
+      logger.info(
+        `[Routes] Plugin "${plugin.manifest.name}" provides route ${route.path}${route.devOnly ? " (dev-only)" : ""}`
+      );
     }
   }
   return pluginRoutes;
@@ -558,14 +558,11 @@ async function compileServerElement(jayHtmlContent, jayHtmlFilename, jayHtmlDir,
   const css = parsedJayFile.css;
   if (css) {
     cssImports = extractCssImportUrls(css);
-    const cssFilename = path.basename(outputPath, ".server-element.js") + ".css";
-    const cssPath = path.join(outputDir, cssFilename);
-    if (minifyCss) {
-      const minified = await transform(css, { loader: "css", minify: true });
-      await fs.writeFile(cssPath, minified.code, "utf-8");
-    } else {
-      await fs.writeFile(cssPath, css, "utf-8");
-    }
+    const cssContent = minifyCss ? (await transform(css, { loader: "css", minify: true })).code : css;
+    const hash = createHash("sha256").update(cssContent).digest("hex").slice(0, 8);
+    const baseName = path.basename(outputPath, ".server-element.js");
+    const cssFilename = `${baseName}-${hash}.css`;
+    await fs.writeFile(path.join(outputDir, cssFilename), cssContent, "utf-8");
     cssFile = cssFilename;
   }
   getLogger().info(`[Build] Compiled server element: ${path.basename(outputPath)}`);
@@ -1134,8 +1131,9 @@ async function buildVersion(options) {
       continue;
     const paramParts = [];
     for (const part of partsWithLoadParams) {
-      const fn = part.compDefinition.loadParams;
-      if (!loadParamsCache.has(fn)) {
+      const propsKey = JSON.stringify(part.headlessProps ?? {});
+      const cacheKey = `${part.key ?? ""}:${propsKey}`;
+      if (!loadParamsCache.has(cacheKey)) {
         logger.important(`[Build] Loading params for ${route.rawRoute}...`);
         const partParams = [];
         let batchIndex = 0;
@@ -1146,9 +1144,9 @@ async function buildVersion(options) {
             logger.important(`[Build]   ...${partParams.length} params so far`);
           }
         }
-        loadParamsCache.set(fn, partParams);
+        loadParamsCache.set(cacheKey, partParams);
       }
-      const cached = loadParamsCache.get(fn);
+      const cached = loadParamsCache.get(cacheKey);
       const keys = new Set(cached.flatMap((p) => Object.keys(p)));
       paramParts.push({ keys, values: cached });
     }

package/dist/{init-services-zmGSxSck.js → init-services-AtDV4X1i.js}

@@ -64,9 +64,14 @@ async function loadProductionPageParts(route, pageModule, jayHtmlContent, projec
     } else {
       modulePath = module;
     }
-    const resolvedModulePath = isLocalModule ? modulePath : require2.resolve(module, { paths: [dirName] });
-    const headlessModule = await import(resolvedModulePath);
-    const headlessCompDef = headlessModule[name];
+    let headlessCompDef;
+    if (headlessImport.structural) {
+      continue;
+    } else {
+      const resolvedModulePath = isLocalModule ? modulePath : require2.resolve(module, { paths: [dirName] });
+      const headlessModule = await import(resolvedModulePath);
+      headlessCompDef = headlessModule[name];
+    }
     if (headlessImport.key) {
       const clientModulePath = isLocalModule ? path.resolve(dirName, module) : `${module}/client`;
       const ci = headlessImport.contract ? { contractName: headlessImport.contract.name, metadata: headlessImport.metadata } : void 0;
@@ -78,18 +83,22 @@ async function loadProductionPageParts(route, pageModule, jayHtmlContent, projec
         contractInfo: ci,
         headlessProps: headlessImport.headlessProps
       });
-      keyedPartModules.push({
-        key: headlessImport.key,
-        modulePath: clientModulePath,
-        exportName: name
-      });
+      const hasClientComp = !!headlessCompDef?.fastRender || !!headlessCompDef?.hasInteractive;
+      if (!headlessImport.structural && hasClientComp) {
+        keyedPartModules.push({
+          key: headlessImport.key,
+          modulePath: clientModulePath,
+          exportName: name
+        });
+      }
       headlessModuleInfos.push({
         modulePath,
         exportName: name,
         isLocal: isLocalModule,
         key: headlessImport.key,
         contractInfo: ci,
-        headlessProps: headlessImport.headlessProps
+        headlessProps: headlessImport.headlessProps,
+        structural: headlessImport.structural
       });
     }
     if (!headlessImport.key && headlessImport.contract) {
@@ -103,7 +112,8 @@ async function loadProductionPageParts(route, pageModule, jayHtmlContent, projec
         exportName: name,
         isLocal: isLocalModule,
         contractName: headlessImport.contractName,
-        propNames: headlessImport.contract.props?.map((p) => p.name) ?? []
+        propNames: headlessImport.contract.props?.map((p) => p.name) ?? [],
+        structural: headlessImport.structural
       });
     }
   }
@@ -163,11 +173,12 @@ function buildPagePartsConfig(pageParts, pageServerModule, pageExportName, build
   for (const info of pageParts.headlessModuleInfos) {
     if (info.contractName) {
       instanceComponents.push({
-        modulePath: info.isLocal ? path.relative(buildDir, info.modulePath) : info.modulePath,
+        modulePath: info.structural ? "" : info.isLocal ? path.relative(buildDir, info.modulePath) : info.modulePath,
         exportName: info.exportName,
         source: info.isLocal ? "local" : "npm",
         contractName: info.contractName,
-        propNames: info.propNames ?? []
+        propNames: info.propNames ?? [],
+        ...info.structural ? { structural: true } : {}
       });
     }
   }
@@ -207,10 +218,12 @@ async function loadPagePartsFromConfig(configPath, artifacts) {
   }
   const headlessInstanceComponents = [];
   for (const entry of config.instanceComponents) {
-    const mod = await importModule(entry);
     const serveTimeContract = {
       props: entry.propNames.map((name) => ({ name }))
     };
+    if (entry.structural)
+      continue;
+    const mod = await importModule(entry);
     headlessInstanceComponents.push({
       contractName: entry.contractName,
       compDefinition: mod[entry.exportName] ?? mod.default,
@@ -424,6 +437,10 @@ async function fetchPageRequest(match, manifest, requestUrl, artifacts, staticBa
     fastViewState,
     route.trackByMap || {}
   );
+  fullViewState.__jay = {
+    params: match.params,
+    url: { path: requestUrl.pathname }
+  };
   const headTagSources = [];
   const slowHeadTags = cf.__slowHeadTags;
   if (slowHeadTags)
@@ -436,7 +453,14 @@ async function fetchPageRequest(match, manifest, requestUrl, artifacts, staticBa
   const headTags = headTagSources.length > 0 ? mergeHeadTags(headTagSources) : [];
   const hasCustomTitle = headTags.some((t) => t.tag?.toLowerCase() === "title");
   const titleTag = hasCustomTitle ? "" : "    <title>Vite + TS</title>\n";
-  const headTagsHtml = headTags.length > 0 ? serializeHeadTags(headTags) + "\n" : "";
+  const preconnectTags = headTags.filter(
+    (t) => t.tag === "link" && t.attrs?.rel === "preconnect"
+  );
+  const otherHeadTags = headTags.filter(
+    (t) => !(t.tag === "link" && t.attrs?.rel === "preconnect")
+  );
+  const preconnectHtml = preconnectTags.length > 0 ? serializeHeadTags(preconnectTags) + "\n" : "";
+  const headTagsHtml = otherHeadTags.length > 0 ? serializeHeadTags(otherHeadTags) + "\n" : "";
   const serverElementPath = route.serverElementPath || instance.serverElementPath;
   const tLoadStart = Date.now();
   const serverElement = await artifacts.loadServerElement(serverElementPath);
@@ -463,7 +487,7 @@ async function fetchPageRequest(match, manifest, requestUrl, artifacts, staticBa
   <head>
     <meta charset="UTF-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-${titleTag}${[cssPreload, cssImportPreloads].filter(Boolean).map((l) => l + "\n").join(
+${titleTag}${[preconnectHtml, cssPreload, cssImportPreloads].filter(Boolean).map((l) => l + "\n").join(
         ""
       )}    <script type="importmap">${JSON.stringify({ imports: importMap })}<\/script>
 ${headParts}

package/dist/{serve-index-lg6huJYm.d.ts → serve-index-XSavezh8.d.ts}

@@ -36,6 +36,8 @@ interface RouteEntry {
     instances: InstanceEntry[];
     isPlugin?: boolean;
     pluginName?: string;
+    /** When true, dev-server tooling route (future: excluded from production builds). */
+    devOnly?: boolean;
 }
 interface InstanceEntry {
     params: Record<string, string>;
@@ -85,6 +87,7 @@ interface PagePartsConfigEntry {
     modulePath: string;
     exportName: string;
     source: 'npm' | 'local';
+    structural?: boolean;
 }
 interface PagePartsConfig {
     parts: Array<PagePartsConfigEntry & {

package/dist/serve-index.d.ts

@@ -1,4 +1,4 @@
-export { e as ArtifactStore, C as CacheEntry, F as FilesystemArtifactStore, I as InstanceEntry, M as MatchResult, n as PreImportedPlugin, a as RouteEntry, R as RouteManifest, S as ServerElementModule, g as fetchActionRequest, f as fetchPageRequest, j as fetchStaticFile, k as initializeServices, l as initializeServicesFromModules, i as isActionRequest, m as matchRequest, r as registerActionsFromManifest, h as registerActionsFromModules } from './serve-index-lg6huJYm.js';
+export { e as ArtifactStore, C as CacheEntry, F as FilesystemArtifactStore, I as InstanceEntry, M as MatchResult, n as PreImportedPlugin, a as RouteEntry, R as RouteManifest, S as ServerElementModule, g as fetchActionRequest, f as fetchPageRequest, j as fetchStaticFile, k as initializeServices, l as initializeServicesFromModules, i as isActionRequest, m as matchRequest, r as registerActionsFromManifest, h as registerActionsFromModules } from './serve-index-XSavezh8.js';
 import '@jay-framework/ssr-runtime';
 import '@jay-framework/compiler-shared';
 import '@jay-framework/stack-server-runtime';

package/dist/serve-index.js

@@ -1,4 +1,4 @@
-import { F, a, f, c, d, e, i, m, r, b } from "./init-services-zmGSxSck.js";
+import { F, a, f, c, d, e, i, m, r, b } from "./init-services-AtDV4X1i.js";
 import "node:fs/promises";
 import "node:path";
 import "@jay-framework/stack-server-runtime";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jay-framework/production-server",
-  "version": "0.22.1",
+  "version": "0.23.0",
   "license": "Apache-2.0",
   "type": "module",
   "main": "dist/index.js",
@@ -30,20 +30,20 @@
     "test:watch": "vitest"
   },
   "dependencies": {
-    "@jay-framework/compiler-jay-html": "^0.22.1",
-    "@jay-framework/compiler-jay-stack": "^0.22.1",
-    "@jay-framework/compiler-shared": "^0.22.1",
-    "@jay-framework/fullstack-component": "^0.22.1",
-    "@jay-framework/logger": "^0.22.1",
-    "@jay-framework/ssr-runtime": "^0.22.1",
-    "@jay-framework/stack-route-scanner": "^0.22.1",
-    "@jay-framework/stack-server-runtime": "^0.22.1",
-    "@jay-framework/view-state-merge": "^0.22.1",
-    "@jay-framework/vite-plugin": "^0.22.1",
+    "@jay-framework/compiler-jay-html": "^0.23.0",
+    "@jay-framework/compiler-jay-stack": "^0.23.0",
+    "@jay-framework/compiler-shared": "^0.23.0",
+    "@jay-framework/fullstack-component": "^0.23.0",
+    "@jay-framework/logger": "^0.23.0",
+    "@jay-framework/ssr-runtime": "^0.23.0",
+    "@jay-framework/stack-route-scanner": "^0.23.0",
+    "@jay-framework/stack-server-runtime": "^0.23.0",
+    "@jay-framework/view-state-merge": "^0.23.0",
+    "@jay-framework/vite-plugin": "^0.23.0",
     "vite": "^5.0.11"
   },
   "devDependencies": {
-    "@jay-framework/dev-environment": "^0.22.1",
+    "@jay-framework/dev-environment": "^0.23.0",
     "@types/node": "^22.15.21",
     "rimraf": "^5.0.5",
     "tsup": "^8.0.1",