@jay-framework/dev-server 0.15.1 → 0.15.3

package/dist/index.d.ts

@@ -3,6 +3,7 @@ import { JayRoute } from '@jay-framework/stack-route-scanner';
 import { RequestHandler } from 'express-serve-static-core';
 import { JayRollupConfig } from '@jay-framework/rollup-plugin';
 import { LogLevel } from '@jay-framework/logger';
+import { Server } from 'node:http';
 import { ProjectClientInitInfo, PluginWithInit, ActionRegistry } from '@jay-framework/stack-server-runtime';
 import { RequestHandler as RequestHandler$1 } from 'express';
 import { JayRollupConfig as JayRollupConfig$1 } from '@jay-framework/compiler-jay-stack';
@@ -34,6 +35,8 @@ interface DevServerOptions {
      * Controls both Jay logging and Vite logging.
      */
     logLevel?: LogLevel;
+    /** HTTP server for HMR WebSocket attachment (avoids default port 24678 collision) */
+    httpServer?: Server;
 }
 
 /**
@@ -182,6 +185,8 @@ interface CreateViteServerOptions {
     logLevel?: 'info' | 'warn' | 'error' | 'silent';
     /** Whether to clear screen on rebuild */
     clearScreen?: boolean;
+    /** HTTP server for HMR WebSocket (avoids default port 24678 collision) */
+    httpServer?: Server;
 }
 /**
  * Creates a Vite server configured for Jay Stack.

package/dist/index.js

@@ -16,7 +16,7 @@ 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 { discoverPluginsWithInit, sortPluginsByDependencies, executePluginServerInits, runInitCallbacks, actionRegistry, discoverAndRegisterActions, discoverAllPluginActions, runShutdownCallbacks, clearLifecycleCallbacks, clearServiceRegistry, clearClientInitData, DevSlowlyChangingPhase, SlowRenderCache, preparePluginClientInits, clearServerElementCache, getServiceRegistry, materializeContracts, loadPageParts, renderFastChangingData, generateClientScript, getClientInitData, generateSSRPageHtml, validateForEachInstances, slowRenderInstances } from "@jay-framework/stack-server-runtime";
 import fs$1 from "node:fs/promises";
 import { pathToFileURL } from "node:url";
 const s$1 = createRequire(import.meta.url), e$1 = s$1("typescript"), c$1 = new Proxy(e$1, {
@@ -1152,8 +1152,8 @@ function extractPackageName(source) {
 function isSubpathImport(source, packageName) {
   return source.length > packageName.length && source[packageName.length] === "/";
 }
-const IMPORT_REGEX = /import\s+(.+?)\s+from\s+(['"])([^'"]+)\2/g;
-const EXPORT_FROM_REGEX = /export\s+(.+?)\s+from\s+(['"])([^'"]+)\2/g;
+const IMPORT_REGEX = /import\s+([\s\S]+?)\s+from\s+(['"])([^'"]+)\2/g;
+const EXPORT_FROM_REGEX = /export\s+([\s\S]+?)\s+from\s+(['"])([^'"]+)\2/g;
 function transformImports(options) {
   const { code, projectRoot, filePath, pluginDetector, verbose = false } = options;
   let hasChanges = false;
@@ -1363,13 +1363,18 @@ async function createViteServer(options) {
     base,
     jayRollupConfig = { tsConfigFilePath: path__default.join(projectRoot, "tsconfig.json") },
     logLevel = "info",
-    clearScreen = true
+    clearScreen = true,
+    httpServer
   } = 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/**"] } },
+    server: {
+      middlewareMode: true,
+      hmr: httpServer ? { server: httpServer } : void 0,
+      watch: { ignored: ["**/build/**"] }
+    },
     // Use Jay Stack compiler for .jay-html and other custom transforms
     plugins: [...jayStackCompiler(jayRollupConfig)],
     // Custom app type (no default middleware)
@@ -1857,7 +1862,8 @@ function defaults(options) {
     jayRollupConfig: {
       ...options.jayRollupConfig || {},
       tsConfigFilePath
-    }
+    },
+    httpServer: options.httpServer
   };
 }
 function handleOtherResponseCodes(res, renderedResult) {
@@ -1908,6 +1914,11 @@ function mkRoute(route, vite, slowlyPhase, options, slowRenderCache, projectInit
         language: "en",
         url
       };
+      const query = {};
+      const urlObj = new URL(req.originalUrl, `http://${req.headers.host}`);
+      for (const [key, value] of urlObj.searchParams) {
+        query[key] = value;
+      }
       if (options.disableSSR) {
         await handleClientOnlyRequest(
           vite,
@@ -1921,7 +1932,8 @@ function mkRoute(route, vite, slowlyPhase, options, slowRenderCache, projectInit
           projectInit,
           res,
           url,
-          timing
+          timing,
+          query
         );
       } else {
         const cachedEntry = await slowRenderCache.get(route.jayHtmlPath, pageParams);
@@ -1938,7 +1950,8 @@ function mkRoute(route, vite, slowlyPhase, options, slowRenderCache, projectInit
             projectInit,
             res,
             url,
-            timing
+            timing,
+            query
           );
         } else {
           await handlePreRenderRequest(
@@ -1954,7 +1967,8 @@ function mkRoute(route, vite, slowlyPhase, options, slowRenderCache, projectInit
             projectInit,
             res,
             url,
-            timing
+            timing,
+            query
           );
         }
       }
@@ -1967,7 +1981,7 @@ function mkRoute(route, vite, slowlyPhase, options, slowRenderCache, projectInit
   };
   return { path: routePath, handler, fsRoute: route };
 }
-async function handleCachedRequest(vite, route, options, cachedEntry, pageParams, pageProps, allPluginClientInits, allPluginsWithInit, projectInit, res, url, timing) {
+async function handleCachedRequest(vite, route, options, cachedEntry, pageParams, pageProps, allPluginClientInits, allPluginsWithInit, projectInit, res, url, timing, query = {}) {
   const loadStart = Date.now();
   const pagePartsResult = await loadPageParts(
     vite,
@@ -2005,7 +2019,8 @@ async function handleCachedRequest(vite, route, options, cachedEntry, pageParams
     instancePhaseData,
     forEachInstances,
     headlessComps,
-    cachedEntry.slowViewState
+    cachedEntry.slowViewState,
+    query
   );
   timing?.recordFastRender(Date.now() - fastStart);
   if (renderedFast.kind !== "PhaseOutput") {
@@ -2033,7 +2048,7 @@ async function handleCachedRequest(vite, route, options, cachedEntry, pageParams
     cachedEntry.preRenderedContent
   );
 }
-async function handlePreRenderRequest(vite, route, options, slowlyPhase, slowRenderCache, pageParams, pageProps, allPluginClientInits, allPluginsWithInit, projectInit, res, url, timing) {
+async function handlePreRenderRequest(vite, route, options, slowlyPhase, slowRenderCache, pageParams, pageProps, allPluginClientInits, allPluginsWithInit, projectInit, res, url, timing, query = {}) {
   const loadStart = Date.now();
   const initialPartsResult = await loadPageParts(
     vite,
@@ -2112,10 +2127,11 @@ async function handlePreRenderRequest(vite, route, options, slowlyPhase, slowRen
     projectInit,
     res,
     url,
-    timing
+    timing,
+    query
   );
 }
-async function handleClientOnlyRequest(vite, route, options, slowlyPhase, pageParams, pageProps, allPluginClientInits, allPluginsWithInit, projectInit, res, url, timing) {
+async function handleClientOnlyRequest(vite, route, options, slowlyPhase, pageParams, pageProps, allPluginClientInits, allPluginsWithInit, projectInit, res, url, timing, query = {}) {
   const loadStart = Date.now();
   const pagePartsResult = await loadPageParts(
     vite,
@@ -2173,7 +2189,8 @@ async function handleClientOnlyRequest(vite, route, options, slowlyPhase, pagePa
     instancePhaseData,
     forEachInstances,
     headlessInstanceComponents,
-    renderedSlowly.rendered
+    renderedSlowly.rendered,
+    query
   );
   timing?.recordFastRender(Date.now() - fastStart);
   if (renderedFast.kind !== "PhaseOutput") {
@@ -2432,7 +2449,8 @@ async function mkDevServer(rawOptions) {
     pagesRoot: pagesRootFolder,
     base: publicBaseUrlPath,
     jayRollupConfig,
-    logLevel: viteLogLevel
+    logLevel: viteLogLevel,
+    httpServer: options.httpServer
   });
   lifecycleManager.setViteServer(vite);
   await lifecycleManager.initialize();
@@ -2509,28 +2527,33 @@ function setupSlowRenderCacheInvalidation(vite, cache, pagesRootFolder) {
       return;
     }
     if (changedPath.endsWith(".jay-html")) {
-      invalidateServerElementCache(changedPath);
+      clearServerElementCache();
       cache.invalidate(changedPath).then(() => {
         getLogger().info(`[SlowRender] Cache invalidated for ${changedPath}`);
+        vite.ws.send({ type: "full-reload" });
       });
       return;
     }
     if (changedPath.endsWith("page.ts")) {
       const dir = path__default.dirname(changedPath);
       const jayHtmlPath = path__default.join(dir, "page.jay-html");
+      clearServerElementCache();
       cache.invalidate(jayHtmlPath).then(() => {
         getLogger().info(
           `[SlowRender] Cache invalidated for ${jayHtmlPath} (page.ts changed)`
         );
+        vite.ws.send({ type: "full-reload" });
       });
       return;
     }
     if (changedPath.endsWith(".jay-contract")) {
       const jayHtmlPath = changedPath.replace(".jay-contract", ".jay-html");
+      clearServerElementCache();
       cache.invalidate(jayHtmlPath).then(() => {
         getLogger().info(
           `[SlowRender] Cache invalidated for ${jayHtmlPath} (contract changed)`
         );
+        vite.ws.send({ type: "full-reload" });
       });
       return;
     }

package/package.json

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