@teamvelix/velix 5.2.1 → 5.2.4

package/dist/runtime/start-prod.js

@@ -701,7 +701,7 @@ init_esm_shims();
 
 // version.ts
 init_esm_shims();
-var VERSION = "5.1.7";
+var VERSION = "5.2.3";
 
 // logger.ts
 var colors = {
@@ -1065,6 +1065,8 @@ import { useFormStatus } from "react-dom";
 
 // helpers.ts
 init_esm_shims();
+import { NotFoundError as CoreNotFoundError } from "@teamvelix/velix-core";
+import { NotFoundError } from "@teamvelix/velix-core";
 var RedirectError = class extends Error {
   url;
   statusCode;
@@ -1076,19 +1078,12 @@ var RedirectError = class extends Error {
     this.statusCode = statusCode;
   }
 };
-var NotFoundError = class extends Error {
-  type = "notFound";
-  constructor(message = "Page not found") {
-    super(message);
-    this.name = "NotFoundError";
-  }
-};
 function redirect(url, type = "replace") {
   const statusCode = type === "permanent" ? 308 : 307;
   throw new RedirectError(url, statusCode);
 }
 function notFound(message) {
-  throw new NotFoundError(message);
+  throw new CoreNotFoundError(message);
 }
 var cookies = {
   parse(cookieHeader) {
@@ -1297,7 +1292,7 @@ var ICON_TERM = `<svg width="14" height="14" viewBox="0 0 24 24" fill="none" str
 var ICON_LOGO = `<img src="/__velix/logo.webp" alt="Velix Logo" width="14" height="14" style="border-radius:2px; object-fit:cover;" onerror="this.style.display='none'" />`;
 function generateDevToolsHtml(isDev, ctx = {}) {
   if (!isDev) return "";
-  const version = ctx.version ?? "5.1.0";
+  const version = ctx.version ?? VERSION;
   const port = ctx.port ?? 3e3;
   const host = ctx.host ?? "localhost";
   const nodeVersion = ctx.nodeVersion ?? process.version.replace("v", "");
@@ -1582,33 +1577,41 @@ function generateDevToolsHtml(isDev, ctx = {}) {
     if(connText) connText.style.color = ok ? '#10b981' : '#ef4444';
   }
 
-  var es = new EventSource('/__velix/hmr');
+  var ws = new WebSocket('ws://' + window.location.host + '/__velix_hmr');
+
+  ws.onopen = function(){ setConn(true); };
 
-  es.onopen = function(){ setConn(true); };
+  ws.onmessage = function(e){
+    var data;
+    try {
+      data = JSON.parse(e.data);
+    } catch(err) { return; }
 
-  es.onmessage = function(e){
-    var data = e.data;
-    if(data === 'reload'){
+    if(data.type === 'full-reload'){
       setStatus('navigating');
       setTimeout(function(){ location.reload(); }, 120);
-    } else if(data === 'building'){
+    } else if(data.type === 'compile-start'){
       setStatus('compiling');
-    } else if(data === 'built'){
+    } else if(data.type === 'compile-done'){
       setStatus('idle');
-    } else if(data.startsWith('rendering:')){
-      setStatus('rendering');
-      setTimeout(function(){ setStatus('idle'); }, 900);
-    } else if(data.startsWith('error:')){
+      var btel = document.getElementById('__vdt-build-time');
+      if(btel) btel.textContent = data.duration + 'ms';
+    } else if(data.type === 'compile-error'){
       setStatus('error');
     }
   };
 
-  es.onerror = function(){
-    if(es.readyState === 2){
+  ws.onerror = function(){
+    if(ws.readyState === 2 || ws.readyState === 3){
       setStatus('error');
       setConn(false);
     }
   };
+  
+  ws.onclose = function(){
+    setStatus('error');
+    setConn(false);
+  };
 
   setStatus('idle');
 })();
@@ -2260,13 +2263,13 @@ async function createServer(options = {}) {
       }
     }
   });
-  const __hmrClients = /* @__PURE__ */ new Set();
-  server.__hmrClients = __hmrClients;
-  server.broadcastHMR = (msg) => {
-    __hmrClients.forEach((c2) => c2.write(`data: ${msg}
-
-`));
-  };
+  if (isDev) {
+    const { createHMRServer } = await import("@teamvelix/velix-core");
+    const hmr = createHMRServer(server, projectRoot);
+    server.broadcastHMR = (msg) => {
+      hmr.broadcast(msg);
+    };
+  }
   const port = config.server.port;
   const host = config.server.host;
   server.listen(port, host, () => {
@@ -2477,8 +2480,53 @@ async function handlePageRoute(route, routes, req, res, url, config, isDev, proj
     ${config.favicon ? `<link rel="icon" href="${config.favicon}">` : ""}
     ${config.styles.map((s) => `<link rel="stylesheet" href="${s}">`).join("\n    ")}
     `;
+    const { resolveErrorBoundary, getErrorBoundaryType } = await import("@teamvelix/velix-core");
+    const { VelixErrorBoundary, VelixDefaultErrorPage } = await import("@teamvelix/velix-react");
+    const errorBoundary = resolveErrorBoundary(route.filePath, appDir, "error");
+    const notFoundBoundary = resolveErrorBoundary(route.filePath, appDir, "not-found");
+    let ErrorComponent = null;
+    let NotFoundComponent = null;
+    if (errorBoundary) {
+      try {
+        const mod2 = await import(`${pathToFileURL3(errorBoundary.filePath).href}?t=${Date.now()}`);
+        ErrorComponent = mod2.default;
+      } catch (e) {
+      }
+    }
+    if (notFoundBoundary) {
+      try {
+        const mod2 = await import(`${pathToFileURL3(notFoundBoundary.filePath).href}?t=${Date.now()}`);
+        NotFoundComponent = mod2.default;
+      } catch (e) {
+      }
+    }
     const searchParams = Object.fromEntries(url.searchParams.entries());
-    let pageElement = await renderComponentAsync(PageComponent, { params: route.params, searchParams, query: searchParams });
+    let pageElement;
+    try {
+      pageElement = await renderComponentAsync(PageComponent, { params: route.params, searchParams, query: searchParams });
+    } catch (ssrError) {
+      const err = ssrError;
+      const errorType = getErrorBoundaryType(err);
+      res.statusCode = err.status || (errorType === "not-found" ? 404 : 500);
+      if (errorType === "not-found" && NotFoundComponent) {
+        pageElement = React2.createElement(NotFoundComponent);
+      } else if (ErrorComponent) {
+        pageElement = React2.createElement(ErrorComponent, { error: err, reset: () => {
+        } });
+      } else {
+        pageElement = React2.createElement(VelixDefaultErrorPage, { error: err, reset: () => {
+        } });
+      }
+    }
+    pageElement = React2.createElement(
+      VelixErrorBoundary,
+      {
+        errorComponent: ErrorComponent,
+        notFoundComponent: NotFoundComponent,
+        routePath: route.filePath
+      },
+      pageElement
+    );
     let layoutElement = pageElement;
     for (let i = layoutModules.length - 1; i >= 0; i--) {
       const layoutMod = layoutModules[i];