@jay-framework/dev-server 0.24.2 → 0.24.4

package/dist/index.js

@@ -1616,6 +1616,11 @@ var __defProp2 = Object.defineProperty;
 var __defNormalProp2 = (obj, key, value) => key in obj ? __defProp2(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
 var __publicField2 = (obj, key, value) => __defNormalProp2(obj, typeof key !== "symbol" ? key + "" : key, value);
 const require$3 = createRequire(import.meta.url);
+function resolveClientImportPath(route) {
+  if (route.clientCompPath) return route.clientCompPath;
+  if (route.componentExport) return route.compPath.replace(/index\.js$/, "index.client.js");
+  return route.compPath;
+}
 async function loadPageParts(vite, route, pagesBase, projectBase, jayRollupConfig, options) {
   const exists = await fs__default.access(route.compPath, fs__default.constants.F_OK).then(() => true).catch(() => false);
   const parts = [];
@@ -1628,7 +1633,7 @@ async function loadPageParts(vite, route, pagesBase, projectBase, jayRollupConfi
         `${route.compPath} does not export "${exportName}". The file exists but the expected export is missing — remove the file or add the export.`
       );
     } else {
-      const clientImportPath = route.componentExport ? route.compPath.replace(/index\.js$/, "index.client.js") : route.compPath;
+      const clientImportPath = resolveClientImportPath(route);
       parts.push({
         compDefinition: pageComponent,
         clientImport: `import {${exportName}} from '${clientImportPath}'`,
@@ -1913,7 +1918,7 @@ function normalizeActionEntry(entry) {
   if (typeof entry === "string") {
     return { name: entry };
   }
-  return { name: entry.name, action: entry.action };
+  return { name: entry.name, action: entry.action, devOnly: entry.devOnly };
 }
 function loadPluginManifest(pluginDir) {
   const pluginYamlPath = path$1.join(pluginDir, "plugin.yaml");
@@ -1995,6 +2000,18 @@ ${clientParts.map((part) => "        " + part.clientPart).join(",\n")}
     slowViewStateDecl
   };
 }
+function buildPageReloadHmrScript() {
+  return `
+      if (import.meta.hot) {
+        import.meta.hot.on('jay:page-reload', (data) => {
+          const prefix = data.routePrefix;
+          const pathname = window.location.pathname;
+          if (pathname === prefix || pathname.startsWith(prefix + '/')) {
+            window.location.reload();
+          }
+        });
+      }`;
+}
 function buildFreezeScript(routePattern) {
   const routePatternLiteral = routePattern ? `'${routePattern}'` : "undefined";
   return `
@@ -2070,15 +2087,7 @@ function buildFreezeScript(routePattern) {
       }
 
       // Targeted page reload: only reload if this page matches the changed route prefix
-      if (import.meta.hot) {
-        import.meta.hot.on('jay:page-reload', (data) => {
-          const prefix = data.routePrefix;
-          const pathname = window.location.pathname;
-          if (pathname === prefix || pathname.startsWith(prefix + '/')) {
-            window.location.reload();
-          }
-        });
-      }`;
+${buildPageReloadHmrScript()}`;
 }
 function buildAutomationWrap(options, mode) {
   const { enableAutomation = true, slowViewState } = options;
@@ -2312,7 +2321,7 @@ ${titleTag}${headExtras ? headExtras + "\n" : ""}  </head>
   </body>
 </html>`;
 }
-async function generateFrozenPageHtml(vite, jayHtmlContent, jayHtmlFilename, jayHtmlDir, viewState, buildFolder, projectRoot, routeDir, tsConfigFilePath, sourceDir, format = "page", freezeName) {
+async function generateFrozenPageHtml(vite, jayHtmlContent, jayHtmlFilename, jayHtmlDir, viewState, buildFolder, projectRoot, routeDir, tsConfigFilePath, sourceDir, format = "page", freezeName, options) {
   const jayHtmlPath = path__default.join(jayHtmlDir, jayHtmlFilename);
   let cached = serverModuleCache.get(jayHtmlPath);
   if (!cached) {
@@ -2358,6 +2367,9 @@ ${ssrHtml}`;
   const cssLink = cached.cssHref ? `    <link rel="stylesheet" href="${cached.cssHref}" />` : "";
   const headExtras = [cssLink, frozenHeadTagsHtml].filter((_) => _).join("\n");
   const label = freezeName ? ` — ${freezeName}` : "";
+  const devHmrScript = options?.injectDevHmr === true ? `
+    <script type="module">${buildPageReloadHmrScript()}
+    <\/script>` : "";
   return `<!doctype html>
 <html lang="en">
   <head>
@@ -2381,7 +2393,7 @@ ${headExtras ? headExtras + "\n" : ""}    <style>
     </style>
   </head>
   <body>
-    <div id="target">${ssrHtml}</div>
+    <div id="target">${ssrHtml}</div>${devHmrScript}
   </body>
 </html>`;
 }
@@ -2762,9 +2774,18 @@ async function registerNpmPluginActions(packageName, pluginConfig, pluginDir, re
     } else {
       pluginModule = await import(packageName);
     }
+    let toolsModule;
+    const loadToolsModule = async () => {
+      if (!toolsModule) {
+        const toolsEntry = `${packageName}/tools`;
+        toolsModule = viteServer ? await viteServer.ssrLoadModule(toolsEntry) : await import(toolsEntry);
+      }
+      return toolsModule;
+    };
     for (const entry of pluginConfig.actions) {
-      const { name: actionName, action: actionPath } = normalizeActionEntry(entry);
-      const actionExport = pluginModule[actionName];
+      const { name: actionName, action: actionPath, devOnly } = normalizeActionEntry(entry);
+      const sourceModule = devOnly ? await loadToolsModule() : pluginModule;
+      const actionExport = sourceModule[actionName];
       if (actionExport && isJayAction(actionExport)) {
         registry.register(actionExport);
         const registeredName = actionExport.actionName;
@@ -2836,6 +2857,13 @@ async function discoverPluginActions(pluginPath, projectRoot, registry = actionR
       return [];
     }
   }
+  const resolveLocalToolsModulePath = () => {
+    for (const candidate of ["tools.ts", "tools.js"]) {
+      const candidatePath = path.join(pluginPath, candidate);
+      if (fs.existsSync(candidatePath)) return candidatePath;
+    }
+    return null;
+  };
   try {
     let pluginModule;
     if (viteServer) {
@@ -2843,9 +2871,23 @@ async function discoverPluginActions(pluginPath, projectRoot, registry = actionR
     } else {
       pluginModule = await import(modulePath);
     }
+    let toolsModule;
+    const loadToolsModule = async () => {
+      if (toolsModule) return toolsModule;
+      const toolsPath = resolveLocalToolsModulePath();
+      if (!toolsPath) {
+        getLogger().warn(
+          `[Actions] Plugin "${pluginName}" declares a devOnly action but has no tools.ts/tools.js module`
+        );
+        return void 0;
+      }
+      toolsModule = viteServer ? await viteServer.ssrLoadModule(toolsPath) : await import(toolsPath);
+      return toolsModule;
+    };
     for (const entry of pluginConfig.actions) {
-      const { name: actionName, action: actionPath } = normalizeActionEntry(entry);
-      const actionExport = pluginModule[actionName];
+      const { name: actionName, action: actionPath, devOnly } = normalizeActionEntry(entry);
+      const sourceModule = devOnly ? await loadToolsModule() : pluginModule;
+      const actionExport = sourceModule?.[actionName];
       if (actionExport && isJayAction(actionExport)) {
         registry.register(actionExport);
         const registeredName = actionExport.actionName;
@@ -4212,11 +4254,19 @@ async function scanPluginRoutes(projectRoot, projectRoutes) {
         continue;
       }
       const isLocalComponent = route.component.startsWith(".");
-      const compPath = isLocalComponent ? path__default.resolve(plugin.pluginPath, route.component) : resolvePluginModule(plugin);
+      const compPath = isLocalComponent ? path__default.resolve(plugin.pluginPath, route.component) : resolvePluginModule(plugin, route.devOnly === true ? "./tools" : ".");
       const componentExport = isLocalComponent ? void 0 : route.component;
+      const clientCompPath = isLocalComponent ? void 0 : resolvePluginExport(plugin.pluginPath, "./client");
+      if (!isLocalComponent && !clientCompPath) {
+        getLogger().error(
+          `[Routes] Plugin "${plugin.name}" route ${route.path}: no "./client" export — hydration cannot load a browser-safe bundle. Add "./client" to package.json exports.`
+        );
+        continue;
+      }
       pluginRoutes.push(
         createRoute(route.path, jayHtmlPath, compPath, componentExport, {
-          devOnly: route.devOnly === true
+          devOnly: route.devOnly === true,
+          clientCompPath
         })
       );
       getLogger().info(
@@ -4254,12 +4304,12 @@ function resolvePluginExport(pluginPath, exportSubpath) {
   }
   return void 0;
 }
-function resolvePluginModule(plugin) {
+function resolvePluginModule(plugin, exportKey = ".") {
   const pkgJsonPath = path__default.join(plugin.pluginPath, "package.json");
   if (fs__default$1.existsSync(pkgJsonPath)) {
     try {
       const pkg = JSON.parse(fs__default$1.readFileSync(pkgJsonPath, "utf-8"));
-      const mainExport = pkg.exports?.["."];
+      const mainExport = pkg.exports?.[exportKey];
       const mainPath = typeof mainExport === "string" ? mainExport : mainExport?.default || mainExport?.import || pkg.main;
       if (mainPath) {
         const resolved = path__default.join(plugin.pluginPath, mainPath);
@@ -4376,6 +4426,7 @@ function mkRoute(route, vite, slowlyPhase, options, slowRenderCache, freezeStore
           pageParams,
           query["format"] === "fragment" ? "fragment" : "page",
           res,
+          url,
           timing
         );
         return;
@@ -4582,9 +4633,7 @@ async function handlePreRenderRequest(vite, route, options, slowlyPhase, slowRen
   );
   if (renderedSlowly.kind !== "PhaseOutput") {
     timing?.recordSlowRender(Date.now() - slowStart);
-    if (renderedSlowly.kind === "ClientError") {
-      handleOtherResponseCodes(res, renderedSlowly);
-    }
+    handleOtherResponseCodes(res, renderedSlowly);
     timing?.end();
     return;
   }
@@ -4694,9 +4743,7 @@ async function handleClientOnlyRequest(vite, route, options, slowlyPhase, pagePa
   );
   if (renderedSlowly.kind !== "PhaseOutput") {
     timing?.recordSlowRender(Date.now() - slowStart);
-    if (renderedSlowly.kind === "ClientError") {
-      handleOtherResponseCodes(res, renderedSlowly);
-    }
+    handleOtherResponseCodes(res, renderedSlowly);
     timing?.end();
     return;
   }
@@ -4828,7 +4875,7 @@ async function sendResponse(vite, res, url, jayHtmlPath, sourceJayHtmlPath, page
   res.status(200).set({ "Content-Type": "text/html" }).send(compiledPageHtml);
   timing?.end();
 }
-async function handleFrozenRequest(vite, route, options, freezeStore, slowRenderCache, freezeId, pageParams, format, res, timing) {
+async function handleFrozenRequest(vite, route, options, freezeStore, slowRenderCache, freezeId, pageParams, format, res, url, timing) {
   const entry = await freezeStore.get(freezeId);
   if (!entry) {
     getLogger().warn(`[Freeze] Freeze "${freezeId}" not found`);
@@ -4851,6 +4898,7 @@ async function handleFrozenRequest(vite, route, options, freezeStore, slowRender
       sourceDir,
       JAY_IMPORT_RESOLVER
     );
+    const injectDevHmr = format === "page";
     const html = await generateFrozenPageHtml(
       vite,
       fullJayHtml,
@@ -4863,13 +4911,19 @@ async function handleFrozenRequest(vite, route, options, freezeStore, slowRender
       options.jayRollupConfig?.tsConfigFilePath,
       sourceDir,
       format,
-      entry.name
+      entry.name,
+      injectDevHmr ? { injectDevHmr: true } : void 0
     );
     const headers = { "Content-Type": "text/html" };
     if (format === "fragment") {
       headers["Access-Control-Allow-Origin"] = "*";
     }
-    res.status(200).set(headers).send(html);
+    if (injectDevHmr) {
+      const compiledHtml = await vite.transformIndexHtml(url || "/", html);
+      res.status(200).set(headers).send(compiledHtml);
+    } else {
+      res.status(200).set(headers).send(html);
+    }
   } catch (err) {
     getLogger().warn(`[Freeze] Failed to render frozen page: ${err.message}`);
     res.status(500).send(`Failed to render frozen page: ${err.message}`);

package/package.json

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