@jay-framework/dev-server 0.16.1 → 0.16.2

package/dist/index.js

@@ -2173,8 +2173,10 @@ async function scanPluginRoutes(projectRoot, projectRoutes) {
         );
         continue;
       }
-      const compPath = route.component.startsWith(".") ? path__default.resolve(plugin.pluginPath, route.component) : resolvePluginModule(plugin);
-      pluginRoutes.push(createRoute(route.path, jayHtmlPath, compPath));
+      const isLocalComponent = route.component.startsWith(".");
+      const compPath = isLocalComponent ? path__default.resolve(plugin.pluginPath, route.component) : resolvePluginModule(plugin);
+      const componentExport = isLocalComponent ? void 0 : route.component;
+      pluginRoutes.push(createRoute(route.path, jayHtmlPath, compPath, componentExport));
       getLogger().info(`[Routes] Plugin "${plugin.name}" provides route ${route.path}`);
     }
   }
@@ -2339,7 +2341,11 @@ function mkRoute(route, vite, slowlyPhase, options, slowRenderCache, freezeStore
           query
         );
       } else {
-        const cachedEntry = await slowRenderCache.get(route.jayHtmlPath, pageParams);
+        const cachedEntry = await slowRenderCache.get(
+          route.jayHtmlPath,
+          pageParams,
+          getRouteDir(route)
+        );
         if (cachedEntry) {
           await handleCachedRequest(
             vite,
@@ -2455,6 +2461,7 @@ async function handleCachedRequest(vite, route, options, cachedEntry, pageParams
     pluginsForPage,
     options,
     routeToExpressRoute(route),
+    getRouteDir(route),
     cachedEntry.slowViewState,
     timing,
     cachedEntry.preRenderedContent,
@@ -2529,7 +2536,8 @@ async function handlePreRenderRequest(vite, route, options, slowlyPhase, slowRen
     pageParams,
     preRenderResult.preRenderedJayHtml,
     renderedSlowly.rendered,
-    carryForward
+    carryForward,
+    getRouteDir(route)
   );
   getLogger().info(`[SlowRender] Cached pre-rendered jay-html at ${cachedEntry.preRenderedPath}`);
   await handleCachedRequest(
@@ -2650,9 +2658,8 @@ 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, 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) {
   let pageHtml;
-  const routeDir = path__default.dirname(path__default.relative(options.pagesRootFolder, sourceJayHtmlPath));
   try {
     let jayHtmlContent = preLoadedContent ?? await fs__default.readFile(jayHtmlPath, "utf-8");
     const jayHtmlFilename = path__default.basename(jayHtmlPath);
@@ -2726,13 +2733,13 @@ async function handleFrozenRequest(vite, route, options, freezeStore, slowRender
   const label = entry.name ? `"${entry.name}" (${freezeId})` : freezeId;
   getLogger().info(`[Freeze] Serving frozen page ${label} for ${route.rawRoute} [${format}]`);
   try {
-    const cachedEntry = await slowRenderCache.get(route.jayHtmlPath, pageParams);
+    const routeDir = getRouteDir(route);
+    const cachedEntry = await slowRenderCache.get(route.jayHtmlPath, pageParams, routeDir);
     const jayHtmlPath = cachedEntry?.preRenderedPath ?? route.jayHtmlPath;
     const jayHtmlContent = cachedEntry?.preRenderedContent ?? await fs__default.readFile(jayHtmlPath, "utf-8");
     const jayHtmlFilename = path__default.basename(jayHtmlPath);
     const jayHtmlDir = path__default.dirname(jayHtmlPath);
     const sourceDir = path__default.dirname(route.jayHtmlPath);
-    const routeDir = path__default.dirname(path__default.relative(options.pagesRootFolder, 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(
@@ -3053,6 +3060,28 @@ function setupFreezeEndpoint(vite, freezeStore) {
   });
   getLogger().info("[Freeze] Freeze endpoint mounted at /_jay/freeze");
 }
+function getRouteDir(route) {
+  return route.rawRoute.replace(/^\//, "") || "index";
+}
+function getRoutePrefix(jayHtmlPath, pagesRootFolder) {
+  const rel = path__default.relative(pagesRootFolder, path__default.dirname(jayHtmlPath));
+  const segments = rel.split(path__default.sep).filter(Boolean);
+  const staticSegments = [];
+  for (const seg of segments) {
+    if (seg.startsWith("["))
+      break;
+    staticSegments.push(seg);
+  }
+  return "/" + staticSegments.join("/");
+}
+function sendPageReload(vite, jayHtmlPath, pagesRootFolder) {
+  const routePrefix = getRoutePrefix(jayHtmlPath, pagesRootFolder);
+  vite.ws.send({
+    type: "custom",
+    event: "jay:page-reload",
+    data: { routePrefix }
+  });
+}
 function setupSlowRenderCacheInvalidation(vite, cache, pagesRootFolder, projectRootFolder) {
   const watchedFiles = /* @__PURE__ */ new Set();
   const watchLinkedFiles = (files) => {
@@ -3079,7 +3108,7 @@ function setupSlowRenderCacheInvalidation(vite, cache, pagesRootFolder, projectR
       clearServerElementCache();
       cache.clear().then(() => {
         getLogger().info(`[SlowRender] Cache cleared (jay-html changed: ${changedPath})`);
-        vite.ws.send({ type: "full-reload" });
+        sendPageReload(vite, changedPath, pagesRootFolder);
       });
       return;
     }
@@ -3094,7 +3123,7 @@ function setupSlowRenderCacheInvalidation(vite, cache, pagesRootFolder, projectR
         getLogger().info(
           `[SlowRender] Cache invalidated for ${jayHtmlPath} (page.ts changed)`
         );
-        vite.ws.send({ type: "full-reload" });
+        sendPageReload(vite, jayHtmlPath, pagesRootFolder);
       });
       return;
     }
@@ -3105,7 +3134,7 @@ function setupSlowRenderCacheInvalidation(vite, cache, pagesRootFolder, projectR
         getLogger().info(
           `[SlowRender] Cache invalidated for ${jayHtmlPath} (contract changed)`
         );
-        vite.ws.send({ type: "full-reload" });
+        sendPageReload(vite, jayHtmlPath, pagesRootFolder);
       });
       return;
     }

package/package.json

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