npm - @vertz/ui-server - Versions diffs - 0.2.22 → 0.2.24 - Mend

@vertz/ui-server 0.2.22 → 0.2.24

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (15) hide show

package/dist/bun-dev-server.d.ts +29 -1
package/dist/bun-dev-server.js +307 -34
package/dist/bun-plugin/fast-refresh-dom-state.js +1 -1
package/dist/bun-plugin/fast-refresh-runtime.js +6 -2
package/dist/bun-plugin/index.js +138 -47
package/dist/dom-shim/index.d.ts +2 -0
package/dist/dom-shim/index.js +1 -1
package/dist/index.d.ts +2 -1
package/dist/index.js +12 -5
package/dist/shared/{chunk-2qsqp9xj.js → chunk-eenfpa59.js} +20 -10
package/dist/shared/{chunk-qzdhe6bn.js → chunk-g0zqrb60.js} +7 -1
package/dist/shared/{chunk-1363r1qw.js → chunk-zs75v8qj.js} +29 -3
package/dist/ssr/index.d.ts +5 -3
package/dist/ssr/index.js +5 -3
package/package.json +5 -5

package/dist/bun-dev-server.d.ts CHANGED Viewed

@@ -72,6 +72,32 @@ interface BunDevServerOptions {
 	* optionally `window.__VERTZ_ACCESS_SET__` for instant auth hydration.
 	*/
 	sessionResolver?: SessionResolver;
+	/**
+	* Watch workspace-linked package dist directories for changes.
+	* When a dist directory changes, automatically restart the server.
+	*
+	* Accepts an array of package names (e.g., ['@vertz/theme-shadcn', '@vertz/ui'])
+	* or `true` to auto-detect all `@vertz/*` packages linked via workspace symlinks.
+	*
+	* @default false
+	*/
+	watchDeps?: boolean | string[];
+	/**
+	* Resolve theme from request for SSR. Returns the value for `data-theme`
+	* on the `<html>` tag and patches any `data-theme` attributes in the SSR body.
+	* Use this to read a theme cookie and eliminate dark→light flash on reload.
+	*/
+	themeFromRequest?: (request: Request) => string | null | undefined;
+	/**
+	* Called when the SSR module fails to recover from a broken state and a
+	* process restart is needed. Bun's ESM module cache retains failed imports
+	* process-wide — the only way to clear it is to restart the process.
+	*
+	* The dev server calls stop() before invoking this callback.
+	* Typically, the callback calls `process.exit(75)` and a supervisor
+	* script restarts the process.
+	*/
+	onRestartNeeded?: () => void;
 }
 interface ErrorDetail {
 	message: string;
@@ -147,11 +173,13 @@ interface SSRPageHtmlOptions {
 	headTags?: string;
 	/** Pre-built session + access set script tags for SSR injection. */
 	sessionScript?: string;
+	/** Theme value for `data-theme` attribute on `<html>`. */
+	htmlDataTheme?: string;
 }
 /**
 * Generate a full SSR HTML page with the given content, CSS, SSR data, and script tag.
 */
-declare function generateSSRPageHtml({ title, css, bodyHtml, ssrData, scriptTag, editor, headTags, sessionScript }: SSRPageHtmlOptions): string;
+declare function generateSSRPageHtml({ title, css, bodyHtml, ssrData, scriptTag, editor, headTags, sessionScript, htmlDataTheme }: SSRPageHtmlOptions): string;
 interface FetchInterceptorOptions {
 	apiHandler: (req: Request) => Promise<Response>;
 	origin: string;

package/dist/bun-dev-server.js CHANGED Viewed

@@ -9,7 +9,7 @@ import {
 // src/bun-dev-server.ts
 import { execSync } from "child_process";
-import { existsSync, mkdirSync, readFileSync as readFileSync2, watch, writeFileSync as writeFileSync2 } from "fs";
+import { existsSync as existsSync2, mkdirSync, readFileSync as readFileSync2, watch as watch2, writeFileSync as writeFileSync2 } from "fs";
 import { dirname, normalize, resolve } from "path";
 // src/debug-logger.ts
@@ -286,6 +286,7 @@ function runWithScopedFetch(interceptor, fn) {
 }
 // src/font-metrics.ts
+import { access as fsAccess } from "fs/promises";
 import { readFile } from "fs/promises";
 import { join as join2 } from "path";
 import { fromBuffer } from "@capsizecss/unpack";
@@ -354,9 +355,15 @@ function getPrimarySrcPath(descriptor) {
     return first.path;
   return null;
 }
-function resolveFilePath(urlPath, rootDir) {
+async function resolveFilePath(urlPath, rootDir) {
   const cleaned = urlPath.startsWith("/") ? urlPath.slice(1) : urlPath;
-  return join2(rootDir, cleaned);
+  const direct = join2(rootDir, cleaned);
+  try {
+    await fsAccess(direct);
+    return direct;
+  } catch {
+    return join2(rootDir, "public", cleaned);
+  }
 }
 async function extractFontMetrics(fonts, rootDir) {
   const result = {};
@@ -370,7 +377,7 @@ async function extractFontMetrics(fonts, rootDir) {
     if (!srcPath.toLowerCase().endsWith(".woff2"))
       continue;
     try {
-      const filePath = resolveFilePath(srcPath, rootDir);
+      const filePath = await resolveFilePath(srcPath, rootDir);
       const buffer = await readFile(filePath);
       const metrics = await fromBuffer(buffer);
       const fallbackFont = typeof adjustFontFallback === "string" ? adjustFontFallback : detectFallbackFont(descriptor.fallback);
@@ -388,6 +395,58 @@ async function extractFontMetrics(fonts, rootDir) {
   return result;
 }
+// src/ready-gate.ts
+function createReadyGate(options) {
+  let ready = false;
+  const pendingClients = new Set;
+  let timeoutHandle = null;
+  function doOpen(currentError) {
+    if (ready)
+      return;
+    ready = true;
+    if (timeoutHandle) {
+      clearTimeout(timeoutHandle);
+      timeoutHandle = null;
+    }
+    for (const ws of pendingClients) {
+      try {
+        ws.sendText(JSON.stringify({ type: "connected" }));
+        if (currentError) {
+          ws.sendText(JSON.stringify({
+            type: "error",
+            category: currentError.category,
+            errors: currentError.errors
+          }));
+        }
+      } catch {}
+    }
+    pendingClients.clear();
+  }
+  if (options?.timeoutMs) {
+    timeoutHandle = setTimeout(() => {
+      if (!ready) {
+        options.onTimeoutWarning?.();
+        doOpen();
+      }
+    }, options.timeoutMs);
+  }
+  return {
+    get isReady() {
+      return ready;
+    },
+    onOpen(ws) {
+      if (ready)
+        return false;
+      pendingClients.add(ws);
+      return true;
+    },
+    onClose(ws) {
+      pendingClients.delete(ws);
+    },
+    open: doOpen
+  };
+}
 // src/source-map-resolver.ts
 import { readFileSync } from "fs";
 import { resolve as resolvePath } from "path";
@@ -953,6 +1012,16 @@ class SSRElement extends SSRNode {
       delete this.attrs.checked;
     }
   }
+  get selected() {
+    return "selected" in this.attrs;
+  }
+  set selected(value) {
+    if (value) {
+      this.attrs.selected = "";
+    } else {
+      delete this.attrs.selected;
+    }
+  }
   get rows() {
     return Number(this.attrs.rows) || 0;
   }
@@ -1096,19 +1165,35 @@ function installDomShim() {
     cookie: ""
   };
   globalThis.document = fakeDocument;
+  const windowStubs = {
+    scrollTo: () => {},
+    scroll: () => {},
+    addEventListener: () => {},
+    removeEventListener: () => {},
+    dispatchEvent: () => true,
+    getComputedStyle: () => ({}),
+    matchMedia: () => ({ matches: false, addListener: () => {}, removeListener: () => {} })
+  };
   if (typeof window === "undefined") {
     globalThis.window = {
       location: { pathname: ssrStorage.getStore()?.url || "/", search: "", hash: "" },
       history: {
         pushState: () => {},
         replaceState: () => {}
-      }
+      },
+      ...windowStubs
     };
   } else {
-    globalThis.window.location = {
-      ...globalThis.window.location || {},
+    const win = globalThis.window;
+    win.location = {
+      ...win.location || {},
       pathname: ssrStorage.getStore()?.url || "/"
     };
+    for (const [key, val] of Object.entries(windowStubs)) {
+      if (typeof win[key] !== "function") {
+        win[key] = val;
+      }
+    }
   }
   globalThis.Node = SSRNode;
   globalThis.HTMLElement = SSRElement;
@@ -1233,6 +1318,9 @@ function serializeToHtml(node) {
     return node.html;
   }
   const { tag, attrs, children } = node;
+  if (tag === "fragment") {
+    return children.map((child) => serializeToHtml(child)).join("");
+  }
   const attrStr = serializeAttrs(attrs);
   if (VOID_ELEMENTS.has(tag)) {
     return `<${tag}${attrStr}>`;
@@ -1309,6 +1397,9 @@ function renderToStream(tree, options) {
       return serializeToHtml(placeholder);
     }
     const { tag, attrs, children } = node;
+    if (tag === "fragment") {
+      return children.map((child) => walkAndSerialize(child)).join("");
+    }
     const isRawText = RAW_TEXT_ELEMENTS.has(tag);
     const attrStr = Object.entries(attrs).map(([k, v]) => ` ${k}="${escapeAttr2(v)}"`).join("");
     if (VOID_ELEMENTS.has(tag)) {
@@ -1604,15 +1695,95 @@ function escapeAttr3(s) {
   return s.replace(/[&"'<>]/g, (c) => `&#${c.charCodeAt(0)};`);
 }
+// src/upstream-watcher.ts
+import { existsSync, lstatSync, readdirSync, realpathSync, watch } from "fs";
+import { join as join3 } from "path";
+function resolveWorkspacePackages(projectRoot, filter) {
+  const results = [];
+  const packageNames = filter === true ? discoverVertzPackages(projectRoot) : parsePackageNames(filter);
+  for (const { scope, name } of packageNames) {
+    const nmPath = join3(projectRoot, "node_modules", scope, name);
+    if (!existsSync(nmPath))
+      continue;
+    const stat = lstatSync(nmPath);
+    if (!stat.isSymbolicLink())
+      continue;
+    const realPath = realpathSync(nmPath);
+    const distPath = join3(realPath, "dist");
+    if (!existsSync(distPath))
+      continue;
+    const fullName = scope ? `${scope}/${name}` : name;
+    results.push({ name: fullName, distPath });
+  }
+  return results;
+}
+function discoverVertzPackages(projectRoot) {
+  const scopeDir = join3(projectRoot, "node_modules", "@vertz");
+  if (!existsSync(scopeDir))
+    return [];
+  return readdirSync(scopeDir).filter((entry) => !entry.startsWith(".")).map((entry) => ({ scope: "@vertz", name: entry }));
+}
+function parsePackageNames(names) {
+  return names.map((pkg) => {
+    const match = pkg.match(/^(@[^/]+)\/(.+)$/);
+    if (match?.[1] && match[2])
+      return { scope: match[1], name: match[2] };
+    return { scope: "", name: pkg };
+  });
+}
+function createUpstreamWatcher(options) {
+  const { projectRoot, watchDeps, onDistChanged, debounceMs = 1000, persistent = false } = options;
+  const packages = resolveWorkspacePackages(projectRoot, watchDeps);
+  const watchers = [];
+  const debounceTimers = new Map;
+  let closed = false;
+  for (const pkg of packages) {
+    try {
+      const watcher = watch(pkg.distPath, { recursive: true, persistent }, () => {
+        if (closed)
+          return;
+        const existing = debounceTimers.get(pkg.name);
+        if (existing)
+          clearTimeout(existing);
+        debounceTimers.set(pkg.name, setTimeout(() => {
+          debounceTimers.delete(pkg.name);
+          if (!closed) {
+            onDistChanged(pkg.name);
+          }
+        }, debounceMs));
+      });
+      watcher.on("error", () => {});
+      watchers.push(watcher);
+    } catch {}
+  }
+  return {
+    packages,
+    close() {
+      closed = true;
+      for (const w of watchers) {
+        try {
+          w.close();
+        } catch {}
+      }
+      watchers.length = 0;
+      for (const timer of debounceTimers.values()) {
+        clearTimeout(timer);
+      }
+      debounceTimers.clear();
+    }
+  };
+}
 // src/bun-dev-server.ts
 function detectFaviconTag(projectRoot) {
   const faviconPath = resolve(projectRoot, "public", "favicon.svg");
-  return existsSync(faviconPath) ? '<link rel="icon" type="image/svg+xml" href="/favicon.svg">' : "";
+  return existsSync2(faviconPath) ? '<link rel="icon" type="image/svg+xml" href="/favicon.svg">' : "";
 }
 var STALE_GRAPH_PATTERNS = [
   /Export named ['"].*['"] not found in module/i,
   /No matching export in ['"].*['"] for import/i,
-  /does not provide an export named/i
+  /does not provide an export named/i,
+  /Failed to resolve module specifier/i
 ];
 function isStaleGraphError(message) {
   return STALE_GRAPH_PATTERNS.some((pattern) => pattern.test(message));
@@ -1712,7 +1883,7 @@ function buildErrorChannelScript(editor) {
     "V._hadClientError=false;",
     "V._needsReload=false;",
     "V._restarting=false;",
-    `V.isStaleGraph=function(m){return/Export named ['"].*['"] not found in module/i.test(m)||/No matching export in ['"].*['"] for import/i.test(m)||/does not provide an export named/i.test(m)};`,
+    `V.isStaleGraph=function(m){return/Export named ['"].*['"] not found in module/i.test(m)||/No matching export in ['"].*['"] for import/i.test(m)||/does not provide an export named/i.test(m)||/Failed to resolve module specifier/i.test(m)};`,
     "V._canAutoRestart=function(){",
     "var raw=sessionStorage.getItem('__vertz_auto_restart');",
     "var ts;try{ts=raw?JSON.parse(raw):[]}catch(e){ts=[]}",
@@ -1884,11 +2055,13 @@ function generateSSRPageHtml({
   scriptTag,
   editor = "vscode",
   headTags = "",
-  sessionScript = ""
+  sessionScript = "",
+  htmlDataTheme
 }) {
   const ssrDataScript = ssrData.length > 0 ? `<script>window.__VERTZ_SSR_DATA__=${safeSerialize(ssrData)};</script>` : "";
+  const htmlAttrs = htmlDataTheme ? ` data-theme="${htmlDataTheme}"` : "";
   return `<!doctype html>
-<html lang="en">
+<html lang="en"${htmlAttrs}>
   <head>
     <meta charset="UTF-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
@@ -1984,7 +2157,10 @@ function createBunDevServer(options) {
     logRequests = true,
     editor: editorOption,
     headTags: headTagsOption = "",
-    sessionResolver
+    sessionResolver,
+    watchDeps,
+    themeFromRequest,
+    onRestartNeeded
   } = options;
   const faviconTag = detectFaviconTag(projectRoot);
   const headTags = [faviconTag, headTagsOption].filter(Boolean).join(`
@@ -2001,6 +2177,7 @@ function createBunDevServer(options) {
   let srcWatcherRef = null;
   let refreshTimeout = null;
   let stopped = false;
+  let ssrFallback = false;
   const wsClients = new Set;
   let currentError = null;
   const sourceMapResolver = createSourceMapResolver(projectRoot);
@@ -2216,7 +2393,7 @@ function createBunDevServer(options) {
     }
   };
   const setupOpenAPIWatcher = () => {
-    if (!openapi || !existsSync(openapi.specPath))
+    if (!openapi || !existsSync2(openapi.specPath))
       return;
     cachedSpec = loadOpenAPISpec();
     if (cachedSpec === null)
@@ -2224,7 +2401,7 @@ function createBunDevServer(options) {
     try {
       const specDir = dirname(openapi.specPath);
       const specFile = openapi.specPath.split("/").pop() || "openapi.json";
-      specWatcher = watch(specDir, { persistent: false }, (eventType, filename) => {
+      specWatcher = watch2(specDir, { persistent: false }, (eventType, filename) => {
         if (filename === specFile && (eventType === "change" || eventType === "rename")) {
           if (logRequests) {
             console.log("[Server] OpenAPI spec file changed, reloading...");
@@ -2242,7 +2419,7 @@ function createBunDevServer(options) {
         headers: { "Content-Type": "application/json" }
       });
     }
-    if (openapi && existsSync(openapi.specPath)) {
+    if (openapi && existsSync2(openapi.specPath)) {
       cachedSpec = loadOpenAPISpec();
       if (cachedSpec) {
         return new Response(JSON.stringify(cachedSpec), {
@@ -2255,6 +2432,42 @@ function createBunDevServer(options) {
   let isRestarting = false;
   let pluginsRegistered = false;
   let stableUpdateManifest = null;
+  let upstreamWatcherRef = null;
+  let pendingDistRestart = false;
+  let restartFn = null;
+  if (watchDeps) {
+    upstreamWatcherRef = createUpstreamWatcher({
+      projectRoot,
+      watchDeps,
+      onDistChanged: (pkgName) => {
+        if (!restartFn || stopped)
+          return;
+        if (logRequests) {
+          console.log(`[Server] Upstream package rebuilt: ${pkgName} \u2014 restarting...`);
+        }
+        if (isRestarting) {
+          pendingDistRestart = true;
+          return;
+        }
+        restartFn().then(() => {
+          if (pendingDistRestart && restartFn && !stopped) {
+            pendingDistRestart = false;
+            restartFn().catch((err) => {
+              const msg = err instanceof Error ? err.message : String(err);
+              console.error(`[Server] Pending upstream restart failed: ${msg}`);
+            });
+          }
+        }).catch((err) => {
+          const msg = err instanceof Error ? err.message : String(err);
+          console.error(`[Server] Upstream restart failed: ${msg}`);
+        });
+      }
+    });
+    if (logRequests && upstreamWatcherRef.packages.length > 0) {
+      const names = upstreamWatcherRef.packages.map((p) => p.name).join(", ");
+      console.log(`[Server] Watching upstream packages: ${names}`);
+    }
+  }
   async function start() {
     const { plugin } = await Promise.resolve(globalThis.Bun);
     const { createVertzBunPlugin } = await import("./bun-plugin/index.js");
@@ -2278,8 +2491,8 @@ function createBunDevServer(options) {
     }
     if (!pluginsRegistered) {
       const { plugin: serverPlugin, updateManifest } = createVertzBunPlugin({
-        hmr: false,
-        fastRefresh: false,
+        hmr: true,
+        fastRefresh: true,
         logger,
         diagnostics
       });
@@ -2290,16 +2503,34 @@ function createBunDevServer(options) {
     const updateServerManifest = stableUpdateManifest;
     let ssrMod;
     try {
-      ssrMod = await import(entryPath);
+      if (isRestarting) {
+        mkdirSync(devDir, { recursive: true });
+        const ssrBootPath = resolve(devDir, "ssr-reload-entry.ts");
+        const ts = Date.now();
+        writeFileSync2(ssrBootPath, `export * from '${entryPath}';
+`);
+        ssrMod = await import(`${ssrBootPath}?t=${ts}`);
+      } else {
+        ssrMod = await import(entryPath);
+      }
+      ssrFallback = false;
       if (logRequests) {
         console.log("[Server] SSR module loaded");
       }
     } catch (e) {
       console.error("[Server] Failed to load SSR module:", e);
       if (isRestarting) {
-        throw e;
+        ssrFallback = true;
+        ssrMod = {};
+        const errMsg = e instanceof Error ? e.message : String(e);
+        const errStack = e instanceof Error ? e.stack : undefined;
+        const { message: _, ...loc } = errStack ? parseSourceFromStack(errStack) : { message: "" };
+        queueMicrotask(() => {
+          broadcastError("ssr", [{ message: errMsg, ...loc, stack: errStack }]);
+        });
+      } else {
+        process.exit(1);
       }
-      process.exit(1);
     }
     let fontFallbackMetrics;
     if (ssrMod.theme?.fonts) {
@@ -2328,6 +2559,12 @@ if (import.meta.hot) import.meta.hot.accept();
     setupOpenAPIWatcher();
     let bundledScriptUrl = null;
     let hmrBootstrapScript = null;
+    const readyGate = createReadyGate({
+      timeoutMs: 5000,
+      onTimeoutWarning: () => {
+        console.warn("[Server] HMR asset discovery timed out \u2014 unblocking clients");
+      }
+    });
     const routes = {
       "/__vertz_hmr": hmrShellModule
     };
@@ -2471,6 +2708,7 @@ data: {}
         if (logRequests) {
           console.log(`[Server] SSR: ${pathname}`);
         }
+        const ssrTheme = themeFromRequest?.(request) ?? undefined;
         try {
           const interceptor = apiHandler ? createFetchInterceptor({
             apiHandler,
@@ -2534,19 +2772,22 @@ data: {}
                 headers: { Location: result.redirect.to }
               });
             }
+            const bodyHtml = ssrTheme ? result.html.replace(/data-theme="[^"]*"/, `data-theme="${ssrTheme}"`) : result.html;
             const scriptTag = buildScriptTag(bundledScriptUrl, hmrBootstrapScript, clientSrc);
             const combinedHeadTags = [headTags, result.headTags].filter(Boolean).join(`
 `);
             const html = generateSSRPageHtml({
               title,
               css: result.css,
-              bodyHtml: result.html,
+              bodyHtml,
               ssrData: result.ssrData,
               scriptTag,
               editor,
               headTags: combinedHeadTags,
-              sessionScript
+              sessionScript,
+              htmlDataTheme: ssrTheme
             });
+            clearError();
             return new Response(html, {
               status: 200,
               headers: {
@@ -2570,7 +2811,8 @@ data: {}
             ssrData: [],
             scriptTag,
             editor,
-            headTags
+            headTags,
+            htmlDataTheme: ssrTheme
           });
           return new Response(fallbackHtml, {
             status: 200,
@@ -2586,13 +2828,15 @@ data: {}
           wsClients.add(ws);
           diagnostics.recordWebSocketChange(wsClients.size);
           logger.log("ws", "client-connected", { total: wsClients.size });
-          ws.sendText(JSON.stringify({ type: "connected" }));
-          if (currentError) {
-            ws.sendText(JSON.stringify({
-              type: "error",
-              category: currentError.category,
-              errors: currentError.errors
-            }));
+          if (!readyGate.onOpen(ws)) {
+            ws.sendText(JSON.stringify({ type: "connected" }));
+            if (currentError) {
+              ws.sendText(JSON.stringify({
+                type: "error",
+                category: currentError.category,
+                errors: currentError.errors
+              }));
+            }
           }
         },
         message(ws, msg) {
@@ -2684,6 +2928,7 @@ data: {}
         },
         close(ws) {
           wsClients.delete(ws);
+          readyGate.onClose(ws);
           diagnostics.recordWebSocketChange(wsClients.size);
         }
       },
@@ -2695,7 +2940,13 @@ data: {}
     if (logRequests) {
       console.log(`[Server] SSR+HMR dev server running at http://${host}:${server.port}`);
     }
-    await discoverHMRAssets();
+    try {
+      await discoverHMRAssets();
+    } finally {
+      if (!readyGate.isReady) {
+        readyGate.open(currentError);
+      }
+    }
     async function discoverHMRAssets() {
       try {
         const res = await fetch(`http://${host}:${server?.port}/__vertz_hmr`);
@@ -2720,8 +2971,8 @@ data: {}
     }
     const srcDir = resolve(projectRoot, "src");
     stopped = false;
-    if (existsSync(srcDir)) {
-      srcWatcherRef = watch(srcDir, { recursive: true }, (_event, filename) => {
+    if (existsSync2(srcDir)) {
+      srcWatcherRef = watch2(srcDir, { recursive: true }, (_event, filename) => {
         if (!filename)
           return;
         if (refreshTimeout)
@@ -2793,6 +3044,19 @@ data: {}
           }
           if (stopped)
             return;
+          if (ssrFallback) {
+            if (onRestartNeeded) {
+              if (logRequests) {
+                console.log("[Server] SSR in fallback mode \u2014 requesting process restart");
+              }
+              await devServer.stop();
+              onRestartNeeded();
+              return;
+            }
+            if (logRequests) {
+              console.log("[Server] SSR in fallback mode \u2014 attempting re-import (best effort)");
+            }
+          }
           const cacheCleared = clearSSRRequireCache();
           logger.log("watcher", "cache-cleared", { entries: cacheCleared });
           const ssrWrapperPath = resolve(devDir, "ssr-reload-entry.ts");
@@ -2803,6 +3067,7 @@ data: {}
           try {
             const freshMod = await import(`${ssrWrapperPath}?t=${Date.now()}`);
             ssrMod = freshMod;
+            ssrFallback = false;
             if (freshMod.theme?.fonts) {
               try {
                 fontFallbackMetrics = await extractFontMetrics(freshMod.theme.fonts, projectRoot);
@@ -2828,6 +3093,7 @@ data: {}
             try {
               const freshMod = await import(`${ssrWrapperPath}?t=${Date.now()}`);
               ssrMod = freshMod;
+              ssrFallback = false;
               if (freshMod.theme?.fonts) {
                 try {
                   fontFallbackMetrics = await extractFontMetrics(freshMod.theme.fonts, projectRoot);
@@ -2848,6 +3114,7 @@ data: {}
               logger.log("watcher", "ssr-reload", { status: "failed", error: errMsg });
               const { message: _m, ...loc2 } = errStack ? parseSourceFromStack(errStack) : { message: "" };
               broadcastError("ssr", [{ message: errMsg, ...loc2, stack: errStack }]);
+              ssrFallback = true;
             }
           }
         }, 100);
@@ -2880,6 +3147,10 @@ data: {}
         server.stop(true);
         server = null;
       }
+      if (upstreamWatcherRef) {
+        upstreamWatcherRef.close();
+        upstreamWatcherRef = null;
+      }
     },
     async restart() {
       if (isRestarting) {
@@ -2910,6 +3181,7 @@ data: {}
       lastBroadcastedError = "";
       lastChangedFile = "";
       clearGraceUntil = 0;
+      ssrFallback = false;
       terminalDedup.reset();
       clearSSRRequireCache();
       sourceMapResolver.invalidate();
@@ -2939,6 +3211,7 @@ data: {}
       isRestarting = false;
     }
   };
+  restartFn = () => devServer.restart();
   return devServer;
 }
 export {

package/dist/bun-plugin/fast-refresh-dom-state.js CHANGED Viewed

@@ -2,7 +2,7 @@
 import {
   captureDOMState,
   restoreDOMState
-} from "../shared/chunk-2qsqp9xj.js";
+} from "../shared/chunk-eenfpa59.js";
 import"../shared/chunk-eb80r8e8.js";
 export {
   restoreDOMState,