@jay-framework/production-server 0.24.7 → 0.25.1

package/dist/index.d.ts

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

package/dist/index.js

@@ -3,8 +3,8 @@ import http from "node:http";
 import { Readable } from "node:stream";
 import path from "node:path";
 import { getLogger } from "@jay-framework/logger";
-import { F as FilesystemArtifactStore, i as initializeServices, r as registerActionsFromManifest, d as isActionRequest, f as fetchActionRequest, b as fetchStaticFile, m as matchRequest, a as fetchPageRequest, l as loadPagePartsFromConfig } from "./init-services-CVQ-U9iX.js";
-import { c, e } from "./init-services-CVQ-U9iX.js";
+import { F as FilesystemArtifactStore, i as initializeServices, r as registerActionsFromManifest, d as isActionRequest, f as fetchActionRequest, b as fetchStaticFile, m as matchRequest, a as fetchPageRequest, l as loadPagePartsFromConfig } from "./init-services-XQt5vxN_.js";
+import { c, e } from "./init-services-XQt5vxN_.js";
 import { parseCookies, scanPlugins, DevSlowlyChangingPhase, slowRenderInstances } from "@jay-framework/stack-server-runtime";
 import { isJayWebhook } from "@jay-framework/fullstack-component";
 import crypto from "node:crypto";
@@ -298,10 +298,11 @@ async function rebuildInstance(route, params, backendDir, rebuildSuffix) {
   } catch (err) {
     return { status: "skipped", reason: `Failed to load page-parts.json: ${err.message}` };
   }
+  const pageUrl = buildUrlFromManifest(route.pattern, params);
   const slowPhase = new DevSlowlyChangingPhase();
   const slowResult = await slowPhase.runSlowlyForPage(
     params,
-    { params },
+    { language: "en", url: pageUrl },
     pageParts.parts,
     pageParts.discoveredInstances,
     pageParts.headlessInstanceComponents
@@ -324,7 +325,7 @@ async function rebuildInstance(route, params, backendDir, rebuildSuffix) {
       {
         pageViewState: slowViewState,
         pageParams: params,
-        pageProps: { language: "en", url: "" }
+        pageProps: { language: "en", url: pageUrl }
       }
     );
     if (instanceSlowResult) {

package/dist/{init-services-CVQ-U9iX.js → init-services-XQt5vxN_.js}

@@ -3,7 +3,7 @@ var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { en
 var __publicField = (obj, key, value) => __defNormalProp(obj, typeof key !== "symbol" ? key + "" : key, value);
 import fs from "node:fs/promises";
 import path from "node:path";
-import { makePassthroughInstanceComponent, renderFastChangingData, headMetaToHeadTags, mergeHeadTags, serializeHeadTags, getClientInitData, actionRegistry, setClientInitData } from "@jay-framework/stack-server-runtime";
+import { makePassthroughInstanceComponent, renderFastChangingData, headMetaToHeadTags, mergeHeadTags, serializeHeadTags, serializeScripts, getClientInitData, actionRegistry, setClientInitData } from "@jay-framework/stack-server-runtime";
 import { deepMergeViewStates } from "@jay-framework/view-state-merge";
 import { asyncSwapScript } from "@jay-framework/ssr-runtime";
 import { isJayAction, isJayStreamAction } from "@jay-framework/fullstack-component";
@@ -259,8 +259,7 @@ async function fetchPageRequest(match, manifest, requestUrl, artifacts, staticBa
   if (slowHeadTags) headTagSources.push(...slowHeadTags);
   if (fastResult.headTags) headTagSources.push(fastResult.headTags);
   const templateHeadTags = headMetaToHeadTags(route.headMeta, fullViewState);
-  if (templateHeadTags.length > 0) headTagSources.push(templateHeadTags);
-  const headTags = headTagSources.length > 0 ? mergeHeadTags(headTagSources) : [];
+  const headTags = headTagSources.length > 0 || templateHeadTags.length > 0 ? mergeHeadTags(headTagSources, templateHeadTags) : [];
   const hasCustomTitle = headTags.some((t) => t.tag?.toLowerCase() === "title");
   const titleTag = hasCustomTitle ? "" : "    <title>Vite + TS</title>\n";
   const preconnectTags = headTags.filter(
@@ -271,6 +270,8 @@ async function fetchPageRequest(match, manifest, requestUrl, artifacts, staticBa
   );
   const preconnectHtml = preconnectTags.length > 0 ? serializeHeadTags(preconnectTags) + "\n" : "";
   const headTagsHtml = otherHeadTags.length > 0 ? serializeHeadTags(otherHeadTags) + "\n" : "";
+  const headScriptsHtml = serializeScripts(route.scripts, "head");
+  const bodyScriptsHtml = serializeScripts(route.scripts, "body");
   const serverElementPath = route.serverElementPath || instance.serverElementPath;
   const tLoadStart = Date.now();
   const serverElement = await artifacts.loadServerElement(serverElementPath);
@@ -292,7 +293,7 @@ async function fetchPageRequest(match, manifest, requestUrl, artifacts, staticBa
   const stream = new ReadableStream({
     async start(controller) {
       const write = (s) => controller.enqueue(encoder.encode(s));
-      const headParts = [headTagsHtml, modulePreloads, cssLink].filter(Boolean).join("\n");
+      const headParts = [headTagsHtml, modulePreloads, cssLink, headScriptsHtml].filter(Boolean).join("\n");
       write(`<!doctype html>
 <html lang="en">
   <head>
@@ -340,7 +341,7 @@ ${headParts}
       const _t=performance.now();
       await init(${initArgs});
       console.log('[jay] hydrate: '+(performance.now()-_t).toFixed(1)+'ms');
-    <\/script>
+    <\/script>${bodyScriptsHtml ? "\n    " + bodyScriptsHtml : ""}
   </body>
 </html>`);
       controller.close();

package/dist/{serve-index-C2Tfaz1E.d.ts → serve-index-CUXzYZBC.d.ts}

@@ -1,5 +1,5 @@
 import * as _jay_framework_ssr_runtime from '@jay-framework/ssr-runtime';
-import { JayHtmlHeadMeta, DevServerPagePart, HeadlessInstanceComponent, ForEachHeadlessInstance, ActionRegistry } from '@jay-framework/stack-server-runtime';
+import { JayHtmlHeadMeta, JayHtmlScript, DevServerPagePart, HeadlessInstanceComponent, ForEachHeadlessInstance, ActionRegistry } from '@jay-framework/stack-server-runtime';
 
 interface RouteManifest {
     version: string;
@@ -32,6 +32,8 @@ interface RouteEntry {
     cssImports?: string[];
     /** Head metadata from jay-html <head> (title, meta tags). */
     headMeta?: JayHtmlHeadMeta;
+    /** Passthrough `<script jay-script="allow">` tags from the jay-html template (DL#149 Phase 2). */
+    scripts?: JayHtmlScript[];
     /** True when page has static <meta name="robots" content="noindex"> */
     noIndex?: boolean;
     instances: InstanceEntry[];

package/dist/serve-index.d.ts

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

package/dist/serve-index.js

@@ -1,4 +1,4 @@
-import { F, f, a, b, i, c, d, m, r, e } from "./init-services-CVQ-U9iX.js";
+import { F, f, a, b, i, c, d, m, r, e } from "./init-services-XQt5vxN_.js";
 export {
   F as FilesystemArtifactStore,
   f as fetchActionRequest,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jay-framework/production-server",
-  "version": "0.24.7",
+  "version": "0.25.1",
   "license": "Apache-2.0",
   "type": "module",
   "main": "dist/index.js",
@@ -30,14 +30,14 @@
     "test:watch": "vitest"
   },
   "dependencies": {
-    "@jay-framework/fullstack-component": "^0.24.7",
-    "@jay-framework/logger": "^0.24.7",
-    "@jay-framework/ssr-runtime": "^0.24.7",
-    "@jay-framework/stack-server-runtime": "^0.24.7",
-    "@jay-framework/view-state-merge": "^0.24.7"
+    "@jay-framework/fullstack-component": "^0.25.1",
+    "@jay-framework/logger": "^0.25.1",
+    "@jay-framework/ssr-runtime": "^0.25.1",
+    "@jay-framework/stack-server-runtime": "^0.25.1",
+    "@jay-framework/view-state-merge": "^0.25.1"
   },
   "devDependencies": {
-    "@jay-framework/dev-environment": "^0.24.7",
+    "@jay-framework/dev-environment": "^0.25.1",
     "@types/node": "^22.15.21",
     "rimraf": "^5.0.5",
     "tsup": "^8.0.1",