@webjsdev/server 0.8.90 → 0.8.91

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@webjsdev/server",
-  "version": "0.8.90",
+  "version": "0.8.91",
   "type": "module",
   "description": "The server for WebJs, a full-stack JavaScript framework built on web components with server-side rendering and no build step. Provides the file-based router, SSR, server actions, route handlers, middleware, and live reload on Node 24+ or Bun.",
   "main": "index.js",

package/src/dev/vendor-retry.js

@@ -39,23 +39,21 @@ export function createRetryBackoff(opts = {}) {
   const now = opts.now ?? Date.now;
   let windowMs = 0;
   let notBefore = 0;
+  // Closures over the state, not methods reading `this`, so a handle can be
+  // destructured or passed as a callback (`onRebuild(backoff.reset)`).
+  const succeeded = () => {
+    windowMs = 0;
+    notBefore = 0;
+  };
   return {
-    allow() {
-      return windowMs === 0 || now() >= notBefore;
-    },
-    failed() {
+    allow: () => windowMs === 0 || now() >= notBefore,
+    failed: () => {
       windowMs = windowMs === 0 ? initialMs : Math.min(maxMs, windowMs * 2);
       notBefore = now() + windowMs;
     },
-    succeeded() {
-      windowMs = 0;
-      notBefore = 0;
-    },
-    reset() {
-      this.succeeded();
-    },
-    windowMs() {
-      return windowMs;
-    },
+    succeeded,
+    // A rebuild forgets the same thing a success does.
+    reset: succeeded,
+    windowMs: () => windowMs,
   };
 }

package/src/ssr/preloads.js

@@ -91,6 +91,9 @@ export function componentPreloads(usedTags, appDir, elidable, lazyFiles) {
  * @param {string[]} entryFiles     absolute paths of the SHIPPED page/layout modules (from `moduleUrls`)
  * @param {string} appDir
  * @param {Set<string>} [elidableComponents]  absolute paths to skip in the walk
+ * @param {Set<string>} [serverFiles]  the action / server-file index, never preloaded
+ * @param {string[]} [precomputedDeps]  the transitive closure `pagePreloadHints` already walked for
+ *   THESE roots and THIS skip set. Omitted, the walk runs here (a direct caller)
  * @returns {string[]}
  */
 export function deduplicatedPreloads(componentUrls, moduleUrls, graph, entryFiles, appDir, serverFiles, elidableComponents, precomputedDeps) {
@@ -172,6 +175,8 @@ export function deduplicatedPreloads(componentUrls, moduleUrls, graph, entryFile
  * @param {string} appDir
  * @param {Set<string>} [elidableComponents]
  * @param {Set<string>} [serverFiles]  the action / server-file index (`'use server'`, incl. no-`.server.` files)
+ * @param {string[]} [precomputedDeps]  the transitive closure `pagePreloadHints` already walked for
+ *   THESE roots and THIS skip set. Omitted, the walk runs here (a direct caller)
  * @returns {Set<string>}
  */
 export function reachedVendorSpecifiers(graph, entryFiles, componentUrls, appDir, elidableComponents, serverFiles, precomputedDeps) {

package/src/ssr/render.js

@@ -3,7 +3,7 @@ import { vendorPreloadTargets } from '../importmap.js';
 import {
   componentPreloads, pagePreloadHints, toUrlPath,
 } from './preloads.js';
-import { shippedBootModules } from './shipped-modules.js';
+import { shippedBootModules, assembleBootModules } from './shipped-modules.js';
 import { seedingEnabled, collectSeeds, buildSeedScript, SEED_DROP_BLOCK } from '../action-seed.js';
 import {
   readRevalidate,
@@ -674,34 +674,21 @@ function reportBoundaryLayoutError(err, opts, cfg = {}) {
  * @returns {string[]}
  */
 function boundaryModuleUrls(boundaryFile, wrapLayouts, opts) {
-  /** @type {string[]} */
-  const urls = [];
-  const seen = new Set();
-  const push = (abs) => {
-    const u = toUrlPath(abs, opts.appDir);
-    if (!seen.has(u)) { seen.add(u); urls.push(u); }
-  };
-  for (const f of (boundaryFile ? [boundaryFile, ...wrapLayouts] : [...wrapLayouts])) {
-    if (opts.inertRouteModules && opts.inertRouteModules.has(f)) continue;
-    const emit = opts.importOnlyRouteModules && opts.importOnlyRouteModules.get(f);
-    if (emit) emit.forEach(push);
-    else push(f);
-  }
-  // instrumentation-client.{js,ts} (#848) rides the SAME first-import contract
-  // it has on the happy path: it runs before app modules so the app's client
-  // error reporting is installed before anything can throw. A boundary page is
-  // where that matters most, so it must not be the one place it is missing.
-  // The set is never empty by the time we get here (the boundary file is
-  // always pushed above, since only pages and layouts are fed to the elision
-  // analysis, so a boundary is never inert and never import-only), which is
-  // why this needs no non-empty guard.
-  if (opts.instrumentationClient) {
-    const u = toUrlPath(opts.instrumentationClient, opts.appDir);
-    const i = urls.indexOf(u);
-    if (i !== -1) urls.splice(i, 1);
-    urls.unshift(u);
-  }
-  return urls;
+  // The happy path's own assembly (`shipped-modules.js`), un-memoized because a
+  // boundary's file list is built per render. instrumentation-client.{js,ts}
+  // (#848) rides the SAME first-import contract it has on the happy path: it
+  // runs before app modules so the app's client error reporting is installed
+  // before anything can throw, and a boundary page is where that matters most.
+  // `lazyFiles` is deliberately not passed: a boundary render has no lazy map
+  // of its own to register a diverted frontier component with, so a `static
+  // lazy` component imported by a boundary is imported eagerly, as before.
+  return assembleBootModules(boundaryFile ? [boundaryFile, ...wrapLayouts] : wrapLayouts, {
+    appDir: opts.appDir,
+    inert: opts.inertRouteModules,
+    importOnly: opts.importOnlyRouteModules,
+    lazyFiles: undefined,
+    instrumentationClient: opts.instrumentationClient,
+  }).moduleUrls;
 }
 
 /**

package/src/ssr/shipped-modules.js

@@ -54,6 +54,24 @@ const MEMO = new WeakMap();
 export function shippedBootModules(route, deps) {
   const hit = MEMO.get(route);
   if (hit && hit.epoch === buildEpoch()) return hit.value;
+  const value = assembleBootModules([route.file, ...route.layouts], deps);
+  MEMO.set(route, { epoch: buildEpoch(), value, hinted: null, hintedBasePath: '' });
+  return value;
+}
+
+/**
+ * The assembly itself, un-memoized: the one loop behind `shippedBootModules`
+ * (a matched page and its layouts) and the boundary render in `ssr/render.js`
+ * (an error / not-found / forbidden / unauthorized file and the layouts it is
+ * wrapped in, a per-render list with no stable object to key a memo on). One
+ * function so the two cannot drift, which is how the 103 Early Hints lost the
+ * lazy-frontier rule before #1644.
+ *
+ * @param {string[]} files  the route modules in import order (page or boundary first, then its layouts)
+ * @param {ShippedDeps} deps
+ * @returns {ShippedModules}
+ */
+export function assembleBootModules(files, deps) {
   const { appDir, inert, importOnly, lazyFiles, instrumentationClient } = deps;
   /** @type {string[]} */
   const moduleUrls = [];
@@ -66,7 +84,7 @@ export function shippedBootModules(route, deps) {
     if (tags) { for (const t of tags) frontierLazy[t] = u; return; }
     if (!seen.has(u)) { seen.add(u); moduleUrls.push(u); }
   };
-  for (const f of [route.file, ...route.layouts]) {
+  for (const f of files) {
     if (inert && inert.has(f)) continue;
     const emit = importOnly && importOnly.get(f);
     if (emit) emit.forEach(push);
@@ -81,9 +99,7 @@ export function shippedBootModules(route, deps) {
     if (i !== -1) moduleUrls.splice(i, 1);
     moduleUrls.unshift(u);
   }
-  const value = { moduleUrls, frontierLazy };
-  MEMO.set(route, { epoch: buildEpoch(), value, hinted: null, hintedBasePath: '' });
-  return value;
+  return { moduleUrls, frontierLazy };
 }
 
 /**