@jay-framework/production-server 0.19.6 → 0.19.8

package/dist/index.d.ts

@@ -1,5 +1,5 @@
-import { B as BuildOptions, R as RouteManifest, a as RouteEntry } from './serve-index-HC05uvRi.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-HC05uvRi.js';
+import { B as BuildOptions, R as RouteManifest, a as RouteEntry } from './serve-index-oMDgTHRv.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-oMDgTHRv.js';
 import '@jay-framework/ssr-runtime';
 import '@jay-framework/compiler-shared';
 import '@jay-framework/stack-server-runtime';

package/dist/index.js

@@ -6,9 +6,9 @@ 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-5lKgLyWS.js";
-import { e, b } from "./init-services-5lKgLyWS.js";
-import crypto from "node:crypto";
+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-J5GZMNJT.js";
+import { e, b } from "./init-services-J5GZMNJT.js";
+import crypto, { createHash } from "node:crypto";
 import fs$1 from "node:fs";
 import { jayRuntime } from "@jay-framework/vite-plugin";
 import { injectHeadfullFSTemplates, JAY_IMPORT_RESOLVER, parseJayFile, generateElementHydrateFile, generateServerElementFile } from "@jay-framework/compiler-jay-html";
@@ -103,6 +103,7 @@ async function buildServerCode(entries, jayOptions, outputDir, projectRoot) {
   }
   await build({
     root: projectRoot,
+    publicDir: false,
     plugins: [...jayStackCompiler(jayOptions)],
     build: {
       ssr: true,
@@ -152,6 +153,7 @@ async function buildSharedChunks(outputDir, _projectRoot, minify = true, pluginC
   }
   const dedupePackages = [...allPackages, "@jay-framework/list-compare"];
   await build({
+    publicDir: false,
     build: {
       outDir: outputDir,
       emptyOutDir: true,
@@ -527,6 +529,7 @@ async function compileServerElement(jayHtmlContent, jayHtmlFilename, jayHtmlDir,
   const jayOptions = { tsConfigFilePath };
   await build({
     root: projectRoot,
+    publicDir: false,
     plugins: [jayRuntime(jayOptions)],
     build: {
       outDir: outputDir,
@@ -604,6 +607,7 @@ async function compileRouteHydrateScript(jayHtmlPath, outputDir, projectRoot, ts
   const jayOptions = { tsConfigFilePath };
   await build({
     root: projectRoot,
+    publicDir: false,
     plugins: [...jayStackCompiler(jayOptions)],
     build: {
       outDir: outputDir,
@@ -738,6 +742,7 @@ async function buildInstanceClient(hydrateEntryPath, instanceId, outputDir, proj
   };
   await build({
     root: projectRoot,
+    publicDir: false,
     plugins: [...jayStackCompiler(fullJayOptions)],
     build: {
       outDir: outputDir,
@@ -920,6 +925,29 @@ async function discoverPluginClientPackages(projectRoot) {
   }
   return result;
 }
+async function collectFiles(dir, base = "") {
+  const entries = await fs.readdir(dir, { withFileTypes: true });
+  const paths = [];
+  for (const entry of entries) {
+    const rel = base ? `${base}/${entry.name}` : entry.name;
+    if (entry.isDirectory()) {
+      paths.push(...await collectFiles(path.join(dir, entry.name), rel));
+    } else {
+      paths.push(rel);
+    }
+  }
+  return paths;
+}
+async function computeBuildHash(buildDir) {
+  const files = (await collectFiles(buildDir)).filter((f) => f !== "backend/build-metadata.json");
+  files.sort();
+  const hash = createHash("sha256");
+  for (const file of files) {
+    hash.update(file);
+    hash.update(await fs.readFile(path.join(buildDir, file)));
+  }
+  return hash.digest("hex").slice(0, 12);
+}
 async function buildVersion(options) {
   const logger = getLogger();
   const buildDir = path.join(options.buildRoot, `v${options.version}`);
@@ -1288,8 +1316,6 @@ async function buildVersion(options) {
   }
   const manifest = {
     version: options.version,
-    buildTimestamp: (/* @__PURE__ */ new Date()).toISOString(),
-    sourceHash: "",
     projectRoot: options.projectRoot,
     sharedManifest,
     routes: routeEntries.map((r) => r.entry),
@@ -1297,10 +1323,18 @@ async function buildVersion(options) {
     plugins
   };
   await writeRouteManifest(manifest, backendDir);
+  const publicFolder = path.join(options.projectRoot, "public");
+  try {
+    await fs.access(publicFolder);
+    await fs.cp(publicFolder, path.join(frontendDir, "public"), { recursive: true });
+    logger.info("[Build] Copied public/ to frontend/public/");
+  } catch {
+  }
+  const sourceHash = await computeBuildHash(buildDir);
   const metadata = {
     version: options.version,
-    sourceHash: "",
-    buildTimestamp: manifest.buildTimestamp,
+    sourceHash,
+    buildTimestamp: (/* @__PURE__ */ new Date()).toISOString(),
     nodeVersion: process.version,
     instanceCount
   };
@@ -1308,14 +1342,9 @@ async function buildVersion(options) {
     path.join(backendDir, "build-metadata.json"),
     JSON.stringify(metadata, null, 2)
   );
-  const publicFolder = path.join(options.projectRoot, "public");
-  try {
-    await fs.access(publicFolder);
-    await fs.cp(publicFolder, path.join(frontendDir, "public"), { recursive: true });
-    logger.info("[Build] Copied public/ to frontend/public/");
-  } catch {
-  }
-  logger.important(`[Build] Done! ${instanceCount} instances built in ${buildDir}`);
+  logger.important(
+    `[Build] Done! ${instanceCount} instances built in ${buildDir} (hash: ${sourceHash})`
+  );
   return manifest;
 }
 function toFetchRequest(req) {
@@ -1880,9 +1909,12 @@ async function startRendererServer(options) {
         const manifest = JSON.parse(
           await fs.readFile(path.join(buildDir, "route-manifest.json"), "utf-8")
         );
+        const metadata = JSON.parse(
+          await fs.readFile(path.join(buildDir, "build-metadata.json"), "utf-8")
+        );
         const status = {
           version: options.version,
-          buildTimestamp: manifest.buildTimestamp,
+          buildTimestamp: metadata.buildTimestamp,
           instanceCount: manifest.routes.reduce((n, r) => n + r.instances.length, 0),
           uptime: Math.floor((Date.now() - startTime) / 1e3),
           webhooks: [...webhookMap.keys()],

package/dist/{init-services-5lKgLyWS.js → init-services-J5GZMNJT.js}

@@ -386,12 +386,13 @@ async function fetchPageRequest(match, manifest, requestUrl, artifacts, staticBa
   ]);
   const tData = Date.now();
   const query = Object.fromEntries(requestUrl.searchParams.entries());
+  const cf = cached.carryForward;
   const fastResult = await renderFastChangingData(
     match.params,
     { params: match.params, query },
     cached.carryForward,
     pageParts.parts,
-    cached.carryForward.__instances,
+    cf.__instances,
     pageParts.forEachInstances,
     pageParts.headlessInstanceComponents,
     cached.slowViewState,
@@ -399,31 +400,32 @@ async function fetchPageRequest(match, manifest, requestUrl, artifacts, staticBa
     cookies
   );
   const tFast = Date.now();
-  if (fastResult.kind === "Redirect3xx") {
+  if (fastResult.kind === "Redirect") {
     return new Response(null, {
       status: fastResult.status,
       headers: { Location: fastResult.location }
     });
   }
-  if (fastResult.kind === "ServerError5xx" || fastResult.kind === "ClientError4xx") {
+  if (fastResult.kind === "ServerError" || fastResult.kind === "ClientError") {
     return new Response(fastResult.message || "Error", {
       status: fastResult.status
     });
   }
   const fastViewState = fastResult.rendered || {};
   const fastCarryForward = fastResult.carryForward || {};
+  const instanceSlowVS = cf.__instances?.slowViewStates;
+  const fullSlowViewState = instanceSlowVS && Object.keys(instanceSlowVS).length > 0 ? { ...cached.slowViewState, __headlessInstances: instanceSlowVS } : cached.slowViewState;
   const fullViewState = deepMergeViewStates(
-    cached.slowViewState,
+    fullSlowViewState,
     fastViewState,
     route.trackByMap || {}
   );
   const headTagSources = [];
-  const slowHeadTags = cached.carryForward.__slowHeadTags;
+  const slowHeadTags = cf.__slowHeadTags;
   if (slowHeadTags)
     headTagSources.push(...slowHeadTags);
-  const fastHeadTags = fastResult.headTags;
-  if (fastHeadTags)
-    headTagSources.push(fastHeadTags);
+  if (fastResult.headTags)
+    headTagSources.push(fastResult.headTags);
   const templateHeadTags = headMetaToHeadTags(route.headMeta, fullViewState);
   if (templateHeadTags.length > 0)
     headTagSources.push(templateHeadTags);
@@ -482,7 +484,7 @@ ${headParts}
       if (asyncScripts)
         write(asyncScripts);
       const clientInitData = getClientInitData();
-      const initArgs = route.routeClientBundlePath ? `${JSON.stringify(cached.slowViewState)}, ${JSON.stringify(fastViewState)}, ${JSON.stringify(fastCarryForward)}, ${JSON.stringify(clientInitData)}` : `${JSON.stringify(fastViewState)}, ${JSON.stringify(fastCarryForward)}, ${JSON.stringify(clientInitData)}`;
+      const initArgs = route.routeClientBundlePath ? `${JSON.stringify(fullSlowViewState)}, ${JSON.stringify(fastViewState)}, ${JSON.stringify(fastCarryForward)}, ${JSON.stringify(clientInitData)}` : `${JSON.stringify(fastViewState)}, ${JSON.stringify(fastCarryForward)}, ${JSON.stringify(clientInitData)}`;
       const tTotal = Date.now() - t0;
       const tLoadMs = tLoad - tLoadStart;
       const serverTiming = {

package/dist/{serve-index-HC05uvRi.d.ts → serve-index-oMDgTHRv.d.ts}

@@ -4,8 +4,6 @@ import { ActionRegistry } from '@jay-framework/stack-server-runtime';
 
 interface RouteManifest {
     version: string;
-    buildTimestamp: string;
-    sourceHash: string;
     projectRoot: string;
     sharedManifest: Record<string, string>;
     routes: RouteEntry[];

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-HC05uvRi.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-oMDgTHRv.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-5lKgLyWS.js";
+import { F, a, f, c, d, e, i, m, r, b } from "./init-services-J5GZMNJT.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.19.6",
+  "version": "0.19.8",
   "license": "Apache-2.0",
   "type": "module",
   "main": "dist/index.js",
@@ -30,20 +30,20 @@
     "test:watch": "vitest"
   },
   "dependencies": {
-    "@jay-framework/compiler-jay-html": "^0.19.6",
-    "@jay-framework/compiler-jay-stack": "^0.19.6",
-    "@jay-framework/compiler-shared": "^0.19.6",
-    "@jay-framework/fullstack-component": "^0.19.6",
-    "@jay-framework/logger": "^0.19.6",
-    "@jay-framework/ssr-runtime": "^0.19.6",
-    "@jay-framework/stack-route-scanner": "^0.19.6",
-    "@jay-framework/stack-server-runtime": "^0.19.6",
-    "@jay-framework/view-state-merge": "^0.19.6",
-    "@jay-framework/vite-plugin": "^0.19.6",
+    "@jay-framework/compiler-jay-html": "^0.19.8",
+    "@jay-framework/compiler-jay-stack": "^0.19.8",
+    "@jay-framework/compiler-shared": "^0.19.8",
+    "@jay-framework/fullstack-component": "^0.19.8",
+    "@jay-framework/logger": "^0.19.8",
+    "@jay-framework/ssr-runtime": "^0.19.8",
+    "@jay-framework/stack-route-scanner": "^0.19.8",
+    "@jay-framework/stack-server-runtime": "^0.19.8",
+    "@jay-framework/view-state-merge": "^0.19.8",
+    "@jay-framework/vite-plugin": "^0.19.8",
     "vite": "^5.0.11"
   },
   "devDependencies": {
-    "@jay-framework/dev-environment": "^0.19.6",
+    "@jay-framework/dev-environment": "^0.19.8",
     "@types/node": "^22.15.21",
     "rimraf": "^5.0.5",
     "tsup": "^8.0.1",