@jay-framework/dev-server 0.14.0 → 0.15.0

package/dist/index.js

@@ -10,10 +10,11 @@ import { createRequire } from "module";
 import "@jay-framework/compiler-shared";
 import * as path from "node:path";
 import path__default from "node:path";
-import { parseContract, slowRenderTransform, JAY_IMPORT_RESOLVER, discoverHeadlessInstances, resolveHeadlessInstances } from "@jay-framework/compiler-jay-html";
+import { JAY_IMPORT_RESOLVER, injectHeadfullFSTemplates, parseContract, slowRenderTransform, discoverHeadlessInstances, resolveHeadlessInstances } from "@jay-framework/compiler-jay-html";
 import { getLogger, getDevLogger } from "@jay-framework/logger";
 import { createRequire as createRequire$1 } from "node:module";
 import * as fs from "node:fs";
+import crypto from "node:crypto";
 import { scanRoutes, routeToExpressRoute } from "@jay-framework/stack-route-scanner";
 import { discoverPluginsWithInit, sortPluginsByDependencies, executePluginServerInits, runInitCallbacks, actionRegistry, discoverAndRegisterActions, discoverAllPluginActions, runShutdownCallbacks, clearLifecycleCallbacks, clearServiceRegistry, clearClientInitData, DevSlowlyChangingPhase, SlowRenderCache, preparePluginClientInits, invalidateServerElementCache, getServiceRegistry, materializeContracts, loadPageParts, renderFastChangingData, generateClientScript, getClientInitData, generateSSRPageHtml, validateForEachInstances, slowRenderInstances } from "@jay-framework/stack-server-runtime";
 import fs$1 from "node:fs/promises";
@@ -1364,6 +1365,8 @@ async function createViteServer(options) {
     logLevel = "info",
     clearScreen = true
   } = options;
+  const instanceId = crypto.randomBytes(4).toString("hex");
+  const cacheDir = path__default.join(projectRoot, "node_modules", `.vite-${instanceId}`);
   const vite = await createServer({
     // Don't start HTTP server - we use middleware mode
     server: { middlewareMode: true, watch: { ignored: ["**/build/**"] } },
@@ -1375,6 +1378,8 @@ async function createViteServer(options) {
     base,
     // Root directory for module resolution
     root: pagesRoot,
+    // Isolate dep optimization cache per instance
+    cacheDir,
     // SSR configuration
     ssr: {
       // Mark jay-framework packages as external so Vite uses Node's require
@@ -1390,6 +1395,13 @@ async function createViteServer(options) {
     logLevel,
     clearScreen
   });
+  const originalClose = vite.close.bind(vite);
+  vite.close = async () => {
+    await originalClose();
+    const { rm } = await import("node:fs/promises");
+    await rm(cacheDir, { recursive: true, force: true }).catch(() => {
+    });
+  };
   return vite;
 }
 async function createViteForCli(options) {
@@ -2204,9 +2216,11 @@ async function sendResponse(vite, res, url, jayHtmlPath, sourceJayHtmlPath, page
   let pageHtml;
   const routeDir = path__default.dirname(path__default.relative(options.pagesRootFolder, sourceJayHtmlPath));
   try {
-    const jayHtmlContent = preLoadedContent ?? await fs$1.readFile(jayHtmlPath, "utf-8");
+    let jayHtmlContent = preLoadedContent ?? await fs$1.readFile(jayHtmlPath, "utf-8");
     const jayHtmlFilename = path__default.basename(jayHtmlPath);
     const jayHtmlDir = path__default.dirname(jayHtmlPath);
+    const sourceDir = path__default.dirname(sourceJayHtmlPath);
+    jayHtmlContent = injectHeadfullFSTemplates(jayHtmlContent, sourceDir, JAY_IMPORT_RESOLVER);
     pageHtml = await generateSSRPageHtml(
       vite,
       jayHtmlContent,
@@ -2284,12 +2298,18 @@ async function preRenderJayHtml(route, slowViewState, headlessContracts, headles
       `[SlowRender] Page ${route.jayHtmlPath} has slow ViewState but no contract. Without a contract, slow bindings cannot be resolved. Move data to withFastRender or add a .jay-contract file with phase annotations.`
     );
   }
-  const result = slowRenderTransform({
+  const sourceDir = path__default.dirname(route.jayHtmlPath);
+  const jayHtmlWithTemplates = injectHeadfullFSTemplates(
     jayHtmlContent,
+    sourceDir,
+    JAY_IMPORT_RESOLVER
+  );
+  const result = slowRenderTransform({
+    jayHtmlContent: jayHtmlWithTemplates,
     slowViewState,
     contract,
     headlessContracts,
-    sourceDir: path__default.dirname(route.jayHtmlPath),
+    sourceDir,
     importResolver: JAY_IMPORT_RESOLVER
   });
   if (!result.val) {
@@ -2424,7 +2444,7 @@ async function mkDevServer(rawOptions) {
   const slowlyPhase = new DevSlowlyChangingPhase();
   const slowRenderCacheDir = path__default.join(buildFolder, "pre-rendered");
   const slowRenderCache = new SlowRenderCache(slowRenderCacheDir, pagesRootFolder);
-  setupSlowRenderCacheInvalidation(vite, slowRenderCache, slowlyPhase, pagesRootFolder);
+  setupSlowRenderCacheInvalidation(vite, slowRenderCache, pagesRootFolder);
   const projectInit = lifecycleManager.getProjectInit() ?? void 0;
   const pluginsWithInit = lifecycleManager.getPluginsWithInit();
   const pluginClientInits = preparePluginClientInits(pluginsWithInit);
@@ -2483,14 +2503,13 @@ function setupActionRouter(vite) {
   vite.middlewares.use(ACTION_ENDPOINT_BASE, createActionRouter());
   getLogger().info(`[Actions] Action router mounted at ${ACTION_ENDPOINT_BASE}`);
 }
-function setupSlowRenderCacheInvalidation(vite, cache, slowlyPhase, pagesRootFolder) {
+function setupSlowRenderCacheInvalidation(vite, cache, pagesRootFolder) {
   vite.watcher.on("change", (changedPath) => {
     if (!changedPath.startsWith(pagesRootFolder)) {
       return;
     }
     if (changedPath.endsWith(".jay-html")) {
       invalidateServerElementCache(changedPath);
-      slowlyPhase.invalidateLoadParamsCache(changedPath);
       cache.invalidate(changedPath).then(() => {
         getLogger().info(`[SlowRender] Cache invalidated for ${changedPath}`);
       });
@@ -2499,7 +2518,6 @@ function setupSlowRenderCacheInvalidation(vite, cache, slowlyPhase, pagesRootFol
     if (changedPath.endsWith("page.ts")) {
       const dir = path__default.dirname(changedPath);
       const jayHtmlPath = path__default.join(dir, "page.jay-html");
-      slowlyPhase.invalidateLoadParamsCache(jayHtmlPath);
       cache.invalidate(jayHtmlPath).then(() => {
         getLogger().info(
           `[SlowRender] Cache invalidated for ${jayHtmlPath} (page.ts changed)`
@@ -2509,7 +2527,6 @@ function setupSlowRenderCacheInvalidation(vite, cache, slowlyPhase, pagesRootFol
     }
     if (changedPath.endsWith(".jay-contract")) {
       const jayHtmlPath = changedPath.replace(".jay-contract", ".jay-html");
-      slowlyPhase.invalidateLoadParamsCache(jayHtmlPath);
       cache.invalidate(jayHtmlPath).then(() => {
         getLogger().info(
           `[SlowRender] Cache invalidated for ${jayHtmlPath} (contract changed)`

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jay-framework/dev-server",
-  "version": "0.14.0",
+  "version": "0.15.0",
   "type": "module",
   "license": "Apache-2.0",
   "main": "dist/index.js",
@@ -23,22 +23,22 @@
     "test:watch": "vitest"
   },
   "dependencies": {
-    "@jay-framework/compiler-jay-stack": "^0.14.0",
-    "@jay-framework/compiler-shared": "^0.14.0",
-    "@jay-framework/component": "^0.14.0",
-    "@jay-framework/fullstack-component": "^0.14.0",
-    "@jay-framework/logger": "^0.14.0",
-    "@jay-framework/runtime": "^0.14.0",
-    "@jay-framework/stack-client-runtime": "^0.14.0",
-    "@jay-framework/stack-route-scanner": "^0.14.0",
-    "@jay-framework/stack-server-runtime": "^0.14.0",
-    "@jay-framework/view-state-merge": "^0.14.0",
+    "@jay-framework/compiler-jay-stack": "^0.15.0",
+    "@jay-framework/compiler-shared": "^0.15.0",
+    "@jay-framework/component": "^0.15.0",
+    "@jay-framework/fullstack-component": "^0.15.0",
+    "@jay-framework/logger": "^0.15.0",
+    "@jay-framework/runtime": "^0.15.0",
+    "@jay-framework/stack-client-runtime": "^0.15.0",
+    "@jay-framework/stack-route-scanner": "^0.15.0",
+    "@jay-framework/stack-server-runtime": "^0.15.0",
+    "@jay-framework/view-state-merge": "^0.15.0",
     "vite": "^5.0.11"
   },
   "devDependencies": {
-    "@jay-framework/dev-environment": "^0.14.0",
-    "@jay-framework/jay-cli": "^0.14.0",
-    "@jay-framework/stack-client-runtime": "^0.14.0",
+    "@jay-framework/dev-environment": "^0.15.0",
+    "@jay-framework/jay-cli": "^0.15.0",
+    "@jay-framework/stack-client-runtime": "^0.15.0",
     "@playwright/test": "^1.58.2",
     "@types/express": "^5.0.2",
     "@types/node": "^22.15.21",