@jay-framework/dev-server 0.19.6 → 0.19.7

package/dist/index.js

@@ -1481,7 +1481,17 @@ async function createViteServer(options) {
       watch: { ignored: ["**/build/**"] }
     },
     // Use Jay Stack compiler for .jay-html and other custom transforms
-    plugins: [...jayStackCompiler(jayRollupConfig)],
+    plugins: [
+      ...jayStackCompiler(jayRollupConfig),
+      {
+        name: "jay-stack-hmr",
+        handleHotUpdate({ file }) {
+          if (file.endsWith(".jay-html") || file.endsWith(".jay-contract") || file.endsWith("page.ts")) {
+            return [];
+          }
+        }
+      }
+    ],
     // Custom app type (no default middleware)
     appType: "custom",
     // Base URL path
@@ -2550,7 +2560,8 @@ async function handleCachedRequest(vite, route, options, cachedEntry, pageParams
     clientTrackByMap,
     usedPackages,
     linkedCssFiles,
-    linkedComponentFiles
+    linkedComponentFiles,
+    scripts: pageScripts
   } = pagePartsResult.val;
   _watchLinkedFiles([...linkedCssFiles || [], ...linkedComponentFiles || []], route);
   const pluginsForPage = filterPluginsForPage(
@@ -2588,8 +2599,10 @@ async function handleCachedRequest(vite, route, options, cachedEntry, pageParams
   const fastViewState = renderedFast.rendered;
   const fastCarryForward = renderedFast.carryForward;
   const headTags = renderedFast.headTags ?? mergeHeadTags(cachedEntry.carryForward?.__slowHeadTags ?? []);
+  const instanceSlowViewStates = instancePhaseData?.slowViewStates;
+  const fullSlowViewState = instanceSlowViewStates && Object.keys(instanceSlowViewStates).length > 0 ? { ...cachedEntry.slowViewState, __headlessInstances: instanceSlowViewStates } : cachedEntry.slowViewState;
   const fullViewState = deepMergeViewStates(
-    cachedEntry.slowViewState,
+    fullSlowViewState,
     fastViewState,
     clientTrackByMap || {}
   );
@@ -2611,7 +2624,8 @@ async function handleCachedRequest(vite, route, options, cachedEntry, pageParams
     cachedEntry.slowViewState,
     timing,
     void 0,
-    headTags
+    headTags,
+    pageScripts
   );
 }
 async function handlePreRenderRequest(vite, route, options, slowlyPhase, slowRenderCache, pageParams, pageProps, allPluginClientInits, allPluginsWithInit, projectInit, res, url, timing, query = {}, cookies = {}) {
@@ -2728,7 +2742,8 @@ async function handleClientOnlyRequest(vite, route, options, slowlyPhase, pagePa
     discoveredInstances,
     forEachInstances,
     linkedCssFiles,
-    linkedComponentFiles
+    linkedComponentFiles,
+    scripts: initialPageScripts
   } = pagePartsResult.val;
   _watchLinkedFiles([...linkedCssFiles || [], ...linkedComponentFiles || []], route);
   const pluginsForPage = filterPluginsForPage(
@@ -2779,8 +2794,10 @@ async function handleClientOnlyRequest(vite, route, options, slowlyPhase, pagePa
       res.setHeader(key, value);
     }
   }
+  const nonCachedInstanceSlowVS = instancePhaseData?.slowViewStates;
+  const fullSlowVS = nonCachedInstanceSlowVS && Object.keys(nonCachedInstanceSlowVS).length > 0 ? { ...renderedSlowly.rendered, __headlessInstances: nonCachedInstanceSlowVS } : renderedSlowly.rendered;
   const viewState = deepMergeViewStates(
-    renderedSlowly.rendered,
+    fullSlowVS,
     renderedFast.rendered,
     serverTrackByMap || {}
   );
@@ -2811,7 +2828,7 @@ async function handleClientOnlyRequest(vite, route, options, slowlyPhase, pagePa
   res.status(200).set({ "Content-Type": "text/html" }).send(compiledPageHtml);
   timing?.end();
 }
-async function sendResponse(vite, res, url, jayHtmlPath, sourceJayHtmlPath, pageParts, viewState, carryForward, clientTrackByMap, projectInit, pluginsForPage, options, routePattern, routeDir, slowViewState, timing, preLoadedContent, headTags) {
+async function sendResponse(vite, res, url, jayHtmlPath, sourceJayHtmlPath, pageParts, viewState, carryForward, clientTrackByMap, projectInit, pluginsForPage, options, routePattern, routeDir, slowViewState, timing, preLoadedContent, headTags, scripts) {
   let pageHtml;
   try {
     const jayHtmlDir = path__default.dirname(jayHtmlPath);
@@ -2840,7 +2857,8 @@ async function sendResponse(vite, res, url, jayHtmlPath, sourceJayHtmlPath, page
         routePattern
       },
       void 0,
-      headTags
+      headTags,
+      scripts
     );
   } catch (err) {
     getLogger().warn(`[SSR] Failed, falling back to client rendering: ${err.message}`);
@@ -2890,12 +2908,10 @@ async function handleFrozenRequest(vite, route, options, freezeStore, slowRender
     const jayHtmlFilename = path__default.basename(jayHtmlPath);
     const jayHtmlDir = path__default.dirname(jayHtmlPath);
     const sourceDir = path__default.dirname(route.jayHtmlPath);
-    const { injectHeadfullFSTemplates: injectHeadfullFSTemplates2 } = await import("@jay-framework/compiler-jay-html");
-    const { JAY_IMPORT_RESOLVER: JAY_IMPORT_RESOLVER2 } = await import("@jay-framework/compiler-jay-html");
-    const fullJayHtml = injectHeadfullFSTemplates2(
+    const fullJayHtml = injectHeadfullFSTemplates(
       jayHtmlContent,
       sourceDir,
-      JAY_IMPORT_RESOLVER2
+      JAY_IMPORT_RESOLVER
     );
     const html = await generateFrozenPageHtml(
       vite,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jay-framework/dev-server",
-  "version": "0.19.6",
+  "version": "0.19.7",
   "type": "module",
   "license": "Apache-2.0",
   "main": "dist/index.js",
@@ -23,23 +23,23 @@
     "test:watch": "vitest"
   },
   "dependencies": {
-    "@jay-framework/compiler-jay-stack": "^0.19.6",
-    "@jay-framework/compiler-shared": "^0.19.6",
-    "@jay-framework/component": "^0.19.6",
-    "@jay-framework/fullstack-component": "^0.19.6",
-    "@jay-framework/logger": "^0.19.6",
-    "@jay-framework/runtime": "^0.19.6",
-    "@jay-framework/stack-client-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/compiler-jay-stack": "^0.19.7",
+    "@jay-framework/compiler-shared": "^0.19.7",
+    "@jay-framework/component": "^0.19.7",
+    "@jay-framework/fullstack-component": "^0.19.7",
+    "@jay-framework/logger": "^0.19.7",
+    "@jay-framework/runtime": "^0.19.7",
+    "@jay-framework/stack-client-runtime": "^0.19.7",
+    "@jay-framework/stack-route-scanner": "^0.19.7",
+    "@jay-framework/stack-server-runtime": "^0.19.7",
+    "@jay-framework/view-state-merge": "^0.19.7",
     "busboy": "^1.6.0",
     "vite": "^5.0.11"
   },
   "devDependencies": {
-    "@jay-framework/dev-environment": "^0.19.6",
-    "@jay-framework/jay-cli": "^0.19.6",
-    "@jay-framework/stack-client-runtime": "^0.19.6",
+    "@jay-framework/dev-environment": "^0.19.7",
+    "@jay-framework/jay-cli": "^0.19.7",
+    "@jay-framework/stack-client-runtime": "^0.19.7",
     "@playwright/test": "^1.58.2",
     "@types/busboy": "^1.5.4",
     "@types/express": "^5.0.2",