@jay-framework/dev-server 0.16.1 → 0.16.3

package/dist/index.js

@@ -13,15 +13,15 @@ import path__default from "node:path";
 import { JAY_IMPORT_RESOLVER, injectHeadfullFSTemplates, parseContract, slowRenderTransform, discoverHeadlessInstances, assignCoordinatesToJayHtml, 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 fs__default$1 from "node:fs";
+import * as fsSync from "node:fs";
+import fsSync__default from "node:fs";
 import { scanRoutes, createRoute, routeToExpressRoute } from "@jay-framework/stack-route-scanner";
 import { discoverPluginsWithInit, sortPluginsByDependencies, executePluginServerInits, runInitCallbacks, actionRegistry, discoverAndRegisterActions, discoverAllPluginActions, runShutdownCallbacks, clearLifecycleCallbacks, clearServiceRegistry, clearClientInitData, loadPageParts, runLoadParams, DevSlowlyChangingPhase, SlowRenderCache, preparePluginClientInits, registerService, clearServerElementCache, scanPlugins, getServiceRegistry, materializeContracts, renderFastChangingData, mergeHeadTags, generateClientScript, getClientInitData, generateSSRPageHtml, generateFrozenPageHtml, validateForEachInstances, slowRenderInstances } from "@jay-framework/stack-server-runtime";
-import * as fs$1 from "node:fs/promises";
+import * as fs from "node:fs/promises";
 import fs__default from "node:fs/promises";
 import { pathToFileURL } from "node:url";
 import Busboy from "busboy";
-import fs$2 from "fs";
+import fs$1 from "fs";
 import path$1 from "path";
 import crypto from "crypto";
 import { randomUUID } from "node:crypto";
@@ -1318,16 +1318,16 @@ function jayStackCompiler(options = {}) {
           const importerDir = path.dirname(importer);
           let resolvedPath = path.resolve(importerDir, source);
           if (!resolvedPath.endsWith(".ts") && !resolvedPath.endsWith(".js")) {
-            if (fs.existsSync(resolvedPath + ".ts")) {
+            if (fsSync.existsSync(resolvedPath + ".ts")) {
               resolvedPath += ".ts";
-            } else if (fs.existsSync(resolvedPath + ".js")) {
+            } else if (fsSync.existsSync(resolvedPath + ".js")) {
               resolvedPath += ".js";
             } else {
               return null;
             }
-          } else if (resolvedPath.endsWith(".js") && !fs.existsSync(resolvedPath)) {
+          } else if (resolvedPath.endsWith(".js") && !fsSync.existsSync(resolvedPath)) {
             const tsPath = resolvedPath.slice(0, -3) + ".ts";
-            if (fs.existsSync(tsPath)) {
+            if (fsSync.existsSync(tsPath)) {
               resolvedPath = tsPath;
             } else {
               return null;
@@ -1342,7 +1342,7 @@ function jayStackCompiler(options = {}) {
           const actualPath = id.slice("\0jay-action:".length);
           let code;
           try {
-            code = await fs.promises.readFile(actualPath, "utf-8");
+            code = await fsSync.promises.readFile(actualPath, "utf-8");
           } catch (err) {
             getLogger().error(
               `[action-transform] Could not read ${actualPath}: ${err}`
@@ -1417,6 +1417,22 @@ async function createViteServer(options) {
     base,
     // Root directory for module resolution
     root: pagesRoot,
+    // Force singleton resolution for all runtime packages.
+    // Without this, pre-bundled deps (in .vite/deps/) inline their own copy
+    // of these packages, while plugin client bundles (served as raw ESM via /@fs/)
+    // resolve to a separate instance → duplicate createJayContext() → runtime crash.
+    resolve: {
+      dedupe: [
+        "@jay-framework/runtime",
+        "@jay-framework/reactive",
+        "@jay-framework/component",
+        "@jay-framework/fullstack-component",
+        "@jay-framework/stack-client-runtime",
+        "@jay-framework/runtime-automation",
+        "@jay-framework/view-state-merge",
+        "@jay-framework/json-patch"
+      ]
+    },
     // SSR configuration
     ssr: {
       // Mark jay-framework packages as external so Vite uses Node's require
@@ -1424,7 +1440,10 @@ async function createViteServer(options) {
       external: ["@jay-framework/stack-server-runtime", "@jay-framework/fullstack-component"]
     },
     // Disable automatic entry point discovery for pre-bundling —
-    // we run in middleware mode with no HTML files, so Vite can't auto-detect entries
+    // we run in middleware mode with no HTML files, so Vite can't auto-detect entries.
+    // Explicitly include singleton packages so Vite pre-bundles them as separate entries.
+    // Without this, stack-client-runtime inlines its own copy of component/reactive/runtime
+    // into the .vite/deps/ chunk, while plugin client bundles import the raw ESM copy → duplicates.
     optimizeDeps: {
       entries: []
     },
@@ -1482,7 +1501,7 @@ class ServiceLifecycleManager {
     const extensions = [".ts", ".js"];
     for (const ext of extensions) {
       const filePath = path.join(this.projectRoot, this.sourceBase, "init" + ext);
-      if (fs.existsSync(filePath)) {
+      if (fsSync.existsSync(filePath)) {
         return filePath;
       }
     }
@@ -1863,7 +1882,7 @@ const DEFAULT_MAX_FILE_SIZE = 10 * 1024 * 1024;
 const DEFAULT_MAX_FILES = 10;
 function parseMultipart(req, tempDir, maxFileSize, maxFiles) {
   return new Promise((resolve, reject) => {
-    fs$2.mkdirSync(tempDir, { recursive: true });
+    fs$1.mkdirSync(tempDir, { recursive: true });
     const files = {};
     let jsonData = {};
     let fileCount = 0;
@@ -1884,7 +1903,7 @@ function parseMultipart(req, tempDir, maxFileSize, maxFiles) {
       const tempPath = path$1.join(tempDir, `${fileCount}-${filename}`);
       let size = 0;
       let truncated = false;
-      const writeStream = fs$2.createWriteStream(tempPath);
+      const writeStream = fs$1.createWriteStream(tempPath);
       stream.pipe(writeStream);
       stream.on("data", (data) => {
         size += data.length;
@@ -1952,7 +1971,7 @@ function parseMultipart(req, tempDir, maxFileSize, maxFiles) {
 }
 function cleanupTempDir(dir) {
   try {
-    fs$2.rmSync(dir, { recursive: true, force: true });
+    fs$1.rmSync(dir, { recursive: true, force: true });
   } catch {
   }
 }
@@ -2032,7 +2051,7 @@ class FreezeStore {
     this.dir = path.join(buildFolder, "freezes");
   }
   async save(route, viewState, routePattern) {
-    await fs$1.mkdir(this.dir, { recursive: true });
+    await fs.mkdir(this.dir, { recursive: true });
     const entry = {
       id: randomUUID().slice(0, 8),
       route,
@@ -2040,7 +2059,7 @@ class FreezeStore {
       viewState,
       createdAt: (/* @__PURE__ */ new Date()).toISOString()
     };
-    await fs$1.writeFile(
+    await fs.writeFile(
       path.join(this.dir, `${entry.id}.json`),
       JSON.stringify(entry, null, 2),
       "utf-8"
@@ -2049,7 +2068,7 @@ class FreezeStore {
   }
   async get(id) {
     try {
-      const content = await fs$1.readFile(path.join(this.dir, `${id}.json`), "utf-8");
+      const content = await fs.readFile(path.join(this.dir, `${id}.json`), "utf-8");
       return JSON.parse(content);
     } catch {
       return void 0;
@@ -2057,13 +2076,13 @@ class FreezeStore {
   }
   async list(route) {
     try {
-      const files = await fs$1.readdir(this.dir);
+      const files = await fs.readdir(this.dir);
       const entries = [];
       for (const file of files) {
         if (!file.endsWith(".json"))
           continue;
         try {
-          const content = await fs$1.readFile(path.join(this.dir, file), "utf-8");
+          const content = await fs.readFile(path.join(this.dir, file), "utf-8");
           const entry = JSON.parse(content);
           if (!route || entry.routePattern === route || entry.route === route) {
             entries.push(entry);
@@ -2083,7 +2102,7 @@ class FreezeStore {
     if (!entry)
       return false;
     entry.name = name;
-    await fs$1.writeFile(
+    await fs.writeFile(
       path.join(this.dir, `${id}.json`),
       JSON.stringify(entry, null, 2),
       "utf-8"
@@ -2092,7 +2111,7 @@ class FreezeStore {
   }
   async delete(id) {
     try {
-      await fs$1.unlink(path.join(this.dir, `${id}.json`));
+      await fs.unlink(path.join(this.dir, `${id}.json`));
       return true;
     } catch {
       return false;
@@ -2173,8 +2192,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}`);
     }
   }
@@ -2184,7 +2205,7 @@ function resolvePluginExport(pluginPath, exportSubpath) {
   const normalized = exportSubpath.replace(/^\.\//, "");
   const packageJsonPath = path__default.join(pluginPath, "package.json");
   try {
-    const packageJson = JSON.parse(fs__default$1.readFileSync(packageJsonPath, "utf-8"));
+    const packageJson = JSON.parse(fsSync__default.readFileSync(packageJsonPath, "utf-8"));
     if (packageJson.exports) {
       const exportKey = "./" + normalized;
       const exportValue = packageJson.exports[exportKey];
@@ -2201,7 +2222,7 @@ function resolvePluginExport(pluginPath, exportSubpath) {
   for (const dir of ["dist", "lib", ""]) {
     const candidate = path__default.join(pluginPath, dir, normalized);
     try {
-      fs__default$1.accessSync(candidate);
+      fsSync__default.accessSync(candidate);
       return candidate;
     } catch {
     }
@@ -2209,11 +2230,25 @@ function resolvePluginExport(pluginPath, exportSubpath) {
   return void 0;
 }
 function resolvePluginModule(plugin) {
+  const pkgJsonPath = path__default.join(plugin.pluginPath, "package.json");
+  if (fsSync__default.existsSync(pkgJsonPath)) {
+    try {
+      const pkg = JSON.parse(fsSync__default.readFileSync(pkgJsonPath, "utf-8"));
+      const mainExport = pkg.exports?.["."];
+      const mainPath = typeof mainExport === "string" ? mainExport : mainExport?.default || mainExport?.import || pkg.main;
+      if (mainPath) {
+        const resolved = path__default.join(plugin.pluginPath, mainPath);
+        if (fsSync__default.existsSync(resolved))
+          return resolved;
+      }
+    } catch {
+    }
+  }
   const modulePath = plugin.manifest.module || "index";
   for (const ext of [".ts", ".js", "/index.ts", "/index.js"]) {
     const candidate = path__default.join(plugin.pluginPath, modulePath + ext);
     try {
-      fs__default$1.accessSync(candidate);
+      fsSync__default.accessSync(candidate);
       return candidate;
     } catch {
     }
@@ -2221,7 +2256,7 @@ function resolvePluginModule(plugin) {
   for (const ext of [".ts", ".js"]) {
     const candidate = path__default.join(plugin.pluginPath, "lib", path__default.basename(modulePath) + ext);
     try {
-      fs__default$1.accessSync(candidate);
+      fsSync__default.accessSync(candidate);
       return candidate;
     } catch {
     }
@@ -2339,7 +2374,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 +2494,7 @@ async function handleCachedRequest(vite, route, options, cachedEntry, pageParams
     pluginsForPage,
     options,
     routeToExpressRoute(route),
+    getRouteDir(route),
     cachedEntry.slowViewState,
     timing,
     cachedEntry.preRenderedContent,
@@ -2529,7 +2569,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 +2691,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 +2766,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 +3093,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 +3141,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 +3156,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 +3167,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.3",
   "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.3",
+    "@jay-framework/compiler-shared": "^0.16.3",
+    "@jay-framework/component": "^0.16.3",
+    "@jay-framework/fullstack-component": "^0.16.3",
+    "@jay-framework/logger": "^0.16.3",
+    "@jay-framework/runtime": "^0.16.3",
+    "@jay-framework/stack-client-runtime": "^0.16.3",
+    "@jay-framework/stack-route-scanner": "^0.16.3",
+    "@jay-framework/stack-server-runtime": "^0.16.3",
+    "@jay-framework/view-state-merge": "^0.16.3",
     "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.3",
+    "@jay-framework/jay-cli": "^0.16.3",
+    "@jay-framework/stack-client-runtime": "^0.16.3",
     "@playwright/test": "^1.58.2",
     "@types/busboy": "^1.5.4",
     "@types/express": "^5.0.2",