octane 0.2.2 → 0.2.4

package/dist/cjs/runtime.server.cjs

@@ -52,11 +52,14 @@ __export(runtime_server_exports, {
   getSsrSuspenseTimeout: () => getSsrSuspenseTimeout,
   hookSlots: () => hookSlots,
   injectStyle: () => injectStyle,
+  invokeManualHook: () => invokeManualHook,
   isChildrenBlock: () => isChildrenBlock,
   isValidElement: () => isValidElement,
   lazy: () => lazy,
+  manualHook: () => manualHook,
   mapSlot: () => mapSlot,
   markChildrenBlock: () => markChildrenBlock,
+  markWarm: () => markWarm,
   memo: () => memo,
   namespaceHead: () => namespaceHead,
   namespaceHeadElement: () => namespaceHeadElement,
@@ -92,7 +95,9 @@ __export(runtime_server_exports, {
   ssrBlock: () => ssrBlock,
   ssrCheckedAttr: () => ssrCheckedAttr,
   ssrChild: () => ssrChild,
+  ssrChildPre: () => ssrChildPre,
   ssrChildText: () => ssrChildText,
+  ssrChildTextPre: () => ssrChildTextPre,
   ssrChildrenSources: () => ssrChildrenSources,
   ssrClass: () => ssrClass,
   ssrComponent: () => ssrComponent,
@@ -103,6 +108,7 @@ __export(runtime_server_exports, {
   ssrFormAuthoringDiagnostics: () => ssrFormAuthoringDiagnostics,
   ssrFragmentMarker: () => ssrFragmentMarker,
   ssrHeadEl: () => ssrHeadEl,
+  ssrHtml: () => ssrHtml,
   ssrInNamespace: () => ssrInNamespace,
   ssrInnerHtml: () => ssrInnerHtml,
   ssrInputAttrs: () => ssrInputAttrs,
@@ -130,6 +136,8 @@ __export(runtime_server_exports, {
   ssrValueAttr: () => ssrValueAttr,
   ssrVoidContent: () => ssrVoidContent,
   startTransition: () => startTransition,
+  styleMap: () => styleMap,
+  touchStyleMap: () => touchStyleMap,
   use: () => use,
   useActionState: () => useActionState,
   useCallback: () => useCallback,
@@ -603,7 +611,9 @@ function fragmentRefDescriptor(value) {
   };
 }
 function renderFragmentRefDescriptor(descriptor, scope) {
-  return ssrFragmentMarker(true, descriptor.ref) + ssrChild(descriptor.children, scope) + ssrFragmentMarker(false);
+  return ssrHtml(
+    ssrFragmentMarker(true, descriptor.ref) + ssrChild(descriptor.children, scope) + ssrFragmentMarker(false)
+  );
 }
 function ssrDeoptWrapperKind(value) {
   return POSITIONAL_CHILDREN.has(value) ? "fragment" : "array";
@@ -900,9 +910,29 @@ const Children = {
   }
 };
 function createPortal(body, target, props = void 0) {
-  return { $$kind: PORTAL_TAG, body, target, props };
+  const key = typeof props === "string" || typeof props === "number" ? String(props) : null;
+  return { $$kind: PORTAL_TAG, body, target, key, props: key === null ? props : void 0 };
 }
 const HTML_ESCAPE_RE = /[&<>]/g;
+const SERVER_HTML = /* @__PURE__ */ Symbol.for("octane.serverHtml");
+class ServerHtml {
+  [SERVER_HTML];
+  constructor(html) {
+    this[SERVER_HTML] = html;
+  }
+  toString() {
+    return this[SERVER_HTML];
+  }
+}
+function ssrHtml(html) {
+  return typeof html === "string" ? new ServerHtml(html) : html;
+}
+function serverComponentOutput(out, scope) {
+  if (out == null) return "";
+  if (typeof out === "string") return escapeHtml(out);
+  if (typeof out === "object" && SERVER_HTML in out) return out[SERVER_HTML];
+  return ssrChild(out, scope);
+}
 function escapeHtml(v) {
   const s = typeof v === "string" ? v : String(v);
   HTML_ESCAPE_RE.lastIndex = 0;
@@ -947,6 +977,9 @@ function ssrChild(v, scope) {
   return ssrChildValue(v, scope, true);
 }
 function ssrChildValue(v, scope, includeKeyedSingle, selfMarkItem = false) {
+  if (v !== null && typeof v === "object" && SERVER_HTML in v) {
+    return v[SERVER_HTML];
+  }
   if (v == null || v === false || v === true) return ssrBlock("");
   if ((typeof v === "object" || typeof v === "function") && (v.$$kind === CONTEXT_TAG || typeof v.then === "function")) {
     return ssrChildValue(
@@ -998,6 +1031,14 @@ function ssrChildText(v, scope) {
   if (typeof v === "object" || typeof v === "function") return ssrChild(v, scope);
   return escapeHtml(v);
 }
+function ssrChildTextPre(v, scope) {
+  const content = ssrChildText(v, scope);
+  return content.charCodeAt(0) === 10 ? "\n" + content : content;
+}
+function ssrChildPre(v, scope) {
+  const content = ssrChild(v, scope);
+  return content.charCodeAt(0) === 10 ? "\n" + content : content;
+}
 function ssrHostElement(tag, props, children, scope, rawInner) {
   if (!VALID_TAG_NAME.test(tag)) {
     throw new Error((0, import_error_codes_server_generated.formatServerError)(30, tag));
@@ -1072,9 +1113,9 @@ function ssrHostElement(tag, props, children, scope, rawInner) {
     } else if (rawInner !== void 0) {
       inner = rawInner;
     } else if (hasChildren) {
-      const scriptText = semanticTag === "script" ? scriptDescriptorText(children) : null;
-      if (scriptText !== null) {
-        inner = escapeEntireInlineScriptContent(scriptText);
+      const rawText = semanticTag === "script" || semanticTag === "style" ? scriptDescriptorText(children) : null;
+      if (rawText !== null) {
+        inner = semanticTag === "script" ? escapeEntireInlineScriptContent(rawText) : escapeEntireInlineStyleContent(rawText);
       } else {
         const build = () => ssrInNamespace(
           childrenNamespace,
@@ -1090,6 +1131,9 @@ function ssrHostElement(tag, props, children, scope, rawInner) {
         inner
       );
     }
+    if ((semanticTag === "pre" || semanticTag === "textarea" || semanticTag === "listing") && inner.charCodeAt(0) === 10) {
+      inner = "\n" + inner;
+    }
     return "<" + tag + attrs + ">" + inner + "</" + tag + ">";
   } finally {
     CURRENT_SSR_ELEMENT = parentElement;
@@ -1116,6 +1160,7 @@ function ssrDeoptBlockChildren(children, scope) {
 }
 function serverDescNeedsBlocks(v) {
   if (v == null || typeof v !== "object") return false;
+  if (v.$$kind === CONTEXT_TAG || typeof v.then === "function") return true;
   if (Array.isArray(v)) {
     for (let i = 0; i < v.length; i++) if (serverDescNeedsBlocks(v[i])) return true;
     return false;
@@ -1160,6 +1205,7 @@ function ssrDeoptItemContent(value, scope) {
 }
 function ssrDescriptorContent(v, scope) {
   if (v == null || v === false || v === true || v === "") return "";
+  if (typeof v === "object" && SERVER_HTML in v) return v[SERVER_HTML];
   if (Array.isArray(v)) {
     let out = "";
     for (let i = 0; i < v.length; i++) out += ssrDescriptorContent(v[i], scope);
@@ -1177,7 +1223,7 @@ function ssrDescriptorContent(v, scope) {
   return escapeHtml(v);
 }
 function ssrBlock(content) {
-  return MARKERS ? import_constants.BLOCK_OPEN + content + import_constants.BLOCK_CLOSE : content;
+  return MARKERS ? import_constants.BLOCK_OPEN + content + import_constants.BLOCK_CLOSE : String(content);
 }
 function ssrFragmentMarker(open, _ref) {
   return MARKERS ? open ? "<!--frag-->" : "<!--/frag-->" : "";
@@ -1186,10 +1232,10 @@ function ssrActivity(mode, render) {
   return ssrBlock(mode === "hidden" ? "" : render());
 }
 function renderActivityDescriptor(props, scope) {
-  return ssrActivity(props.mode ?? "visible", () => ssrChild(props.children, scope));
+  return ssrHtml(ssrActivity(props.mode ?? "visible", () => ssrChild(props.children, scope)));
 }
 function ssrForBlock(content, hasItems) {
-  return MARKERS ? (hasItems ? import_constants.FOR_BLOCK_OPEN_ITEMS : import_constants.FOR_BLOCK_OPEN_EMPTY) + content + import_constants.BLOCK_CLOSE : content;
+  return MARKERS ? (hasItems ? import_constants.FOR_BLOCK_OPEN_ITEMS : import_constants.FOR_BLOCK_OPEN_EMPTY) + content + import_constants.BLOCK_CLOSE : String(content);
 }
 const ASCII_ASYNC_IDENTITY_UNITS = [];
 for (let code = 0; code < 128; code++) {
@@ -1370,10 +1416,10 @@ function ssrAttr(name, v, tag, namespace = "html") {
     return ' class="' + escapeAttr((0, import_css.normalizeClass)(v)) + '"';
   }
   if (name.charCodeAt(0) === 97 && name.startsWith("aria-")) {
-    if (v == null) return "";
+    if (v == null || typeof v === "function" || typeof v === "symbol") return "";
     return " " + name + '="' + escapeAttr(String(v)) + '"';
   }
-  if (name === "suppressContentEditableWarning" || name === "suppressHydrationWarning" || name === "suppressNativeChangeWarning" || name === "__octaneNativeChangeDiagnostic")
+  if (name === "innerText" || name === "textContent" || name === "suppressContentEditableWarning" || name === "suppressHydrationWarning" || name === "suppressNativeChangeWarning" || name === "__octaneNativeChangeDiagnostic")
     return "";
   const t = typeof v;
   if (t === "boolean" && (0, import_constants.isEnumeratedBooleanAttr)(name)) {
@@ -1429,6 +1475,7 @@ function ssrAttr(name, v, tag, namespace = "html") {
       return "";
     }
     if (import_constants.POSITIVE_NUMERIC_ATTR_PROPS.has(lower) && !(Number(v) >= 1)) return "";
+    if ((lower === "rowspan" || lower === "start") && Number.isNaN(Number(v))) return "";
   }
   if (v == null || v === false) return "";
   if (process.env.NODE_ENV !== "production" && !isCustomTag && tag !== void 0 && t === "object" && v.toString === Object.prototype.toString) {
@@ -1520,8 +1567,9 @@ function isAggregatedFormAttribute(tag, name) {
 function ssrAttrs(sources, tag, namespace = "html", skipFormControls = false) {
   namespace = resolveAttributeNamespace(namespace);
   const props = /* @__PURE__ */ new Map();
+  let classMerges = null;
   let sourceOrder = 0;
-  const record = (rawName, value) => {
+  function record(rawName, value) {
     if (typeof rawName !== "string") return;
     const order = sourceOrder++;
     const previous = props.get(rawName);
@@ -1531,9 +1579,17 @@ function ssrAttrs(sources, tag, namespace = "html", skipFormControls = false) {
       firstOrder: previous?.firstOrder ?? order,
       lastOrder: order
     });
-  };
-  for (const [isSpread, sourceOrName, directValue] of sources) {
+  }
+  for (const [isSpread, sourceOrName, directValue, merge] of sources) {
     if (!isSpread) {
+      if (merge === true && typeof sourceOrName === "string" && (sourceOrName === "class" || sourceOrName === "className")) {
+        (classMerges ??= []).push({
+          rawName: sourceOrName,
+          value: directValue,
+          order: sourceOrder++
+        });
+        continue;
+      }
       record(sourceOrName, directValue);
       continue;
     }
@@ -1545,6 +1601,24 @@ function ssrAttrs(sources, tag, namespace = "html", skipFormControls = false) {
       record(name, source[name]);
     }
   }
+  if (process.env.NODE_ENV === "production") {
+    let canonical = true;
+    for (const name of props.keys()) {
+      if (normalizeSsrAttributeName(name, tag, namespace) !== name || namespace === "html" && name.toLowerCase() !== name) {
+        canonical = false;
+        break;
+      }
+    }
+    if (canonical) {
+      let out2 = "";
+      for (const { rawName, value } of props.values()) {
+        if (rawName === "dangerouslySetInnerHTML" || skipFormControls && isAggregatedFormAttribute(tag, rawName))
+          continue;
+        out2 += ssrAttrEntry(rawName, value, tag, namespace);
+      }
+      return out2;
+    }
+  }
   const resolved = /* @__PURE__ */ new Map();
   let needsWinningOrderSort = false;
   for (const writer of props.values()) {
@@ -1571,6 +1645,24 @@ function ssrAttrs(sources, tag, namespace = "html", skipFormControls = false) {
       lastOrder
     ]);
   }
+  if (classMerges !== null) {
+    for (const extra of classMerges) {
+      const name = normalizeSsrAttributeName(extra.rawName, tag, namespace);
+      if (!import_constants.VALID_ATTR_NAME.test(name)) continue;
+      const identity = namespace === "html" ? name.toLowerCase() : name;
+      const previous = resolved.get(identity);
+      if (previous !== void 0) {
+        resolved.set(identity, [
+          previous[0],
+          (0, import_css.mergeClass)(previous[1], extra.value),
+          previous[2],
+          extra.order
+        ]);
+        continue;
+      }
+      resolved.set(identity, [name, extra.value, extra.order, extra.order]);
+    }
+  }
   let out = "";
   const ordered = [...resolved.values()];
   if (needsWinningOrderSort) ordered.sort((a, b) => a[2] - b[2]);
@@ -1755,7 +1847,7 @@ function ssrFormAuthoringDiagnostics(tag, sources) {
   return "";
 }
 function ssrValueAttr(v) {
-  if (v == null) return "";
+  if (v == null || typeof v === "function" || typeof v === "symbol") return "";
   return ' value="' + escapeAttr(typeof v === "string" ? v : String(v)) + '"';
 }
 function ssrCheckedAttr(v) {
@@ -2236,7 +2328,7 @@ function renderComponentFramed(comp, props, parent, frame, inherit) {
       ACTIVE_PU_WARM_PLANS.length = warmPlanCheckpoint;
       HOOK_PASS = previousHookPass;
     }
-    const inner = typeof out === "string" ? out : out == null ? "" : ssrChild(out, scope);
+    const inner = serverComponentOutput(out, scope);
     nativeCompleted = true;
     return MARKERS && !inherit ? import_constants.BLOCK_OPEN + inner + import_constants.BLOCK_CLOSE : inner;
   } catch (error) {
@@ -2278,7 +2370,7 @@ function ssrComponent(parent, comp, props, inherit, key, identityScoped) {
         const kids = props?.children;
         if (typeof kids === "function") {
           const out = kids(void 0, parent);
-          const inner = typeof out === "string" ? out : out == null ? "" : ssrChild(out, parent);
+          const inner = serverComponentOutput(out, parent);
           const html2 = ssrHostElement(tag, props, null, parent, inner);
           return inherit ? html2 : ssrBlock(html2);
         }
@@ -2334,7 +2426,8 @@ function ssrInNamespace(namespace, render) {
   }
 }
 function ssrChildrenHtml(children, scope) {
-  if (typeof children === "function") return children(void 0, scope) ?? "";
+  if (typeof children === "function")
+    return serverComponentOutput(children(void 0, scope), scope);
   return ssrChild(children, scope);
 }
 function streamTokenForPendingHtml(html) {
@@ -2368,7 +2461,8 @@ const PermanentStaticHydrate = /* @__PURE__ */ (0, import_component_flags.markCo
     if (nativeCapture < 0) NATIVE_SERVER_READS = null;
     PERMANENT_STATIC_HYDRATE_DEPTH++;
     try {
-      if (inheritedPermanentStatic || !MARKERS) return ssrChildrenHtml(props.children, scope);
+      if (inheritedPermanentStatic || !MARKERS)
+        return ssrHtml(ssrChildrenHtml(props.children, scope));
       const childIdStart = ID_COUNTER;
       const serialStart = SERIAL?.length ?? 0;
       const children = ssrBlock(
@@ -2385,7 +2479,9 @@ const PermanentStaticHydrate = /* @__PURE__ */ (0, import_component_flags.markCo
       const streamToken = streamTokenForPendingHtml(children);
       const markerToken = streamToken === null ? "" : streamToken + ":";
       const endToken = streamToken === null ? "" : ":" + streamToken;
-      return `<!--${import_constants.HYDRATE_STATIC_ID_COUNT_PREFIX}${markerToken}${idCount}-->` + children + `<!--${import_constants.HYDRATE_STATIC_END}${endToken}-->`;
+      return ssrHtml(
+        `<!--${import_constants.HYDRATE_STATIC_ID_COUNT_PREFIX}${markerToken}${idCount}-->` + children + `<!--${import_constants.HYDRATE_STATIC_END}${endToken}-->`
+      );
     } finally {
       finishNativeSeedCapture(nativeCapture, previousNativeReads, false);
       PERMANENT_STATIC_HYDRATE_DEPTH--;
@@ -2397,51 +2493,53 @@ const PermanentStaticHydrate = /* @__PURE__ */ (0, import_component_flags.markCo
 const hydrate = /* @__PURE__ */ (0, import_component_flags.markComponentFlags)(
   function Hydrate(props, scope) {
     const id = useId();
-    return withSsrElementContext(
-      "div",
-      void 0,
-      () => ssrInNamespace("html", () => {
-        if (!MARKERS) {
-          return "<div>" + ssrChildrenHtml(props.children, scope) + "</div>";
-        }
-        const childIdStart = ID_COUNTER;
-        const serialStart = SERIAL?.length ?? 0;
-        const nativeCapture = NATIVE_READ_COLLECTOR?.beginCapture() ?? -1;
-        const previousNativeReads = NATIVE_SERVER_READS;
-        if (nativeCapture < 0) NATIVE_SERVER_READS = null;
-        let children;
-        let nativeReads = null;
-        try {
-          children = ssrBlock(
-            ssrTry(
-              scope,
-              "jsx-hydrate",
-              (_arg, childScope) => ssrChildrenHtml(props.children, childScope),
-              null,
-              null,
-              "html"
-            )
+    return ssrHtml(
+      withSsrElementContext(
+        "div",
+        void 0,
+        () => ssrInNamespace("html", () => {
+          if (!MARKERS) {
+            return "<div>" + ssrChildrenHtml(props.children, scope) + "</div>";
+          }
+          const childIdStart = ID_COUNTER;
+          const serialStart = SERIAL?.length ?? 0;
+          const nativeCapture = NATIVE_READ_COLLECTOR?.beginCapture() ?? -1;
+          const previousNativeReads = NATIVE_SERVER_READS;
+          if (nativeCapture < 0) NATIVE_SERVER_READS = null;
+          let children;
+          let nativeReads = null;
+          try {
+            children = ssrBlock(
+              ssrTry(
+                scope,
+                "jsx-hydrate",
+                (_arg, childScope) => ssrChildrenHtml(props.children, childScope),
+                null,
+                null,
+                "html"
+              )
+            );
+          } finally {
+            nativeReads = finishNativeSeedCapture(nativeCapture, previousNativeReads, false);
+          }
+          const idCount = ID_COUNTER - childIdStart;
+          const childSeeds = SERIAL === null ? [] : SERIAL.splice(serialStart);
+          const permanentStaticAncestor = PERMANENT_STATIC_HYDRATE_DEPTH !== 0;
+          const attrs = ssrHydrateAttrs(
+            id,
+            props.when,
+            idCount,
+            permanentStaticAncestor,
+            streamTokenForPendingHtml(children)
           );
-        } finally {
-          nativeReads = finishNativeSeedCapture(nativeCapture, previousNativeReads, false);
-        }
-        const idCount = ID_COUNTER - childIdStart;
-        const childSeeds = SERIAL === null ? [] : SERIAL.splice(serialStart);
-        const permanentStaticAncestor = PERMANENT_STATIC_HYDRATE_DEPTH !== 0;
-        const attrs = ssrHydrateAttrs(
-          id,
-          props.when,
-          idCount,
-          permanentStaticAncestor,
-          streamTokenForPendingHtml(children)
-        );
-        const seedJson = permanentStaticAncestor || childSeeds.length === 0 ? null : serializeSuspenseSeedJson(childSeeds);
-        const seedSidecar = seedJson === null || seedJson === "[]" ? "" : '<script type="application/json" ' + import_constants.HYDRATE_SEED_ATTR + NONCE_ATTR + ">" + seedJson + "</script>";
-        const nativeSeeds = permanentStaticAncestor ? void 0 : NATIVE_READ_COLLECTOR?.serialize(nativeReads);
-        const nativeSidecar = nativeSeeds === void 0 ? "" : serializeNativeSignalSeeds(nativeSeeds, NONCE_ATTR);
-        return "<div" + attrs + ">" + children + seedSidecar + nativeSidecar + "</div>";
-      }),
-      "html"
+          const seedJson = permanentStaticAncestor || childSeeds.length === 0 ? null : serializeSuspenseSeedJson(childSeeds);
+          const seedSidecar = seedJson === null || seedJson === "[]" ? "" : '<script type="application/json" ' + import_constants.HYDRATE_SEED_ATTR + NONCE_ATTR + ">" + seedJson + "</script>";
+          const nativeSeeds = permanentStaticAncestor ? void 0 : NATIVE_READ_COLLECTOR?.serialize(nativeReads);
+          const nativeSidecar = nativeSeeds === void 0 ? "" : serializeNativeSignalSeeds(nativeSeeds, NONCE_ATTR);
+          return "<div" + attrs + ">" + children + seedSidecar + nativeSidecar + "</div>";
+        }),
+        "html"
+      )
     );
   },
   import_component_flags.COMPONENT_FLAG_BOUNDARY,
@@ -2454,17 +2552,22 @@ function initializeHydrateComponent() {
 const Hydrate2 = /* @__PURE__ */ initializeHydrateComponent();
 const Suspense = /* @__PURE__ */ (0, import_component_flags.markComponentFlags)(
   function Suspense2(props, scope) {
-    return ssrTry(
-      scope,
-      "jsx-suspense",
-      (_arg, s) => ssrChildrenHtml(props.children, s),
-      (_arg, s) => ssrChild(props.fallback, s),
-      null,
-      FRAME?.namespace ?? "html"
+    return ssrHtml(
+      ssrTry(
+        scope,
+        "jsx-suspense",
+        (_arg, s) => ssrChildrenHtml(props.children, s),
+        (_arg, s) => ssrChild(props.fallback, s),
+        null,
+        FRAME?.namespace ?? "html",
+        false,
+        true
+      )
     );
   },
   import_component_flags.COMPONENT_FLAG_BOUNDARY,
-  "Suspense"
+  "Suspense",
+  /* @__PURE__ */ Symbol.for("octane.suspense")
 );
 let VT_SSR_TRY_SEQ = 0;
 let VT_SSR_HAS_CANDIDATES = false;
@@ -2577,7 +2680,7 @@ const ViewTransition = /* @__PURE__ */ (0, import_component_flags.markComponentF
     attrs.push(["vt-enter-x", vtSsrResolve(props, "enter")]);
     attrs.push(["vt-exit-x", vtSsrResolve(props, "exit")]);
     if (named) attrs.push(["vt-share", cand.share]);
-    return ssrBlock(vtSsrAnnotate(inner, attrs));
+    return ssrHtml(ssrBlock(vtSsrAnnotate(inner, attrs)));
   },
   import_component_flags.COMPONENT_FLAG_BOUNDARY,
   "ViewTransition"
@@ -2586,21 +2689,27 @@ function addTransitionType(_type) {
 }
 const ErrorBoundary = /* @__PURE__ */ (0, import_component_flags.markComponentFlags)(
   function ErrorBoundary2(props, scope) {
-    return ssrBlock(
-      (() => {
-        try {
-          return withAsyncIdentity(
-            "error-boundary",
-            "content",
-            () => ssrBlock(ssrChildrenHtml(props.children, scope))
-          );
-        } catch (e) {
-          e = normalizeThrownServerThenable(e);
-          if (ssrIsSuspense(e)) throw e;
-          const fb = typeof props.fallback === "function" ? props.fallback(e, NOOP) : props.fallback;
-          return withAsyncIdentity("error-boundary", "catch", () => ssrBlock(ssrChild(fb, scope)));
-        }
-      })()
+    return ssrHtml(
+      ssrBlock(
+        (() => {
+          try {
+            return withAsyncIdentity(
+              "error-boundary",
+              "content",
+              () => ssrBlock(ssrChildrenHtml(props.children, scope))
+            );
+          } catch (e) {
+            e = normalizeThrownServerThenable(e);
+            if (ssrIsSuspense(e)) throw e;
+            const fb = typeof props.fallback === "function" ? props.fallback(e, NOOP) : props.fallback;
+            return withAsyncIdentity(
+              "error-boundary",
+              "catch",
+              () => ssrBlock(ssrChild(fb, scope))
+            );
+          }
+        })()
+      )
     );
   },
   import_component_flags.COMPONENT_FLAG_BOUNDARY,
@@ -2609,7 +2718,7 @@ const ErrorBoundary = /* @__PURE__ */ (0, import_component_flags.markComponentFl
 const CONTEXT_TAG = /* @__PURE__ */ Symbol.for("octane.context");
 function createContext(defaultValue) {
   const ctx = function ProviderBody(props, scope) {
-    return renderServerContextProvider(ctx, props, scope);
+    return ssrHtml(renderServerContextProvider(ctx, props, scope));
   };
   ctx.$$kind = CONTEXT_TAG;
   ctx.defaultValue = defaultValue;
@@ -2637,7 +2746,7 @@ function renderServerContextProvider(context, props, renderScope) {
   scope.$$ctxValues.set(context, props.value);
   const children = props.children;
   if (children == null) return "";
-  return typeof children === "function" ? children(void 0, scope) ?? "" : ssrChild(children, scope);
+  return ssrHtml(ssrChildrenHtml(children, scope));
 }
 function readContext(ctx) {
   for (let s = CURRENT_SCOPE; s !== null; s = s.parent) {
@@ -2832,6 +2941,11 @@ function hasExternalHydrationOwner(thenable) {
   }
 }
 function use(usable, siteKey, directSite) {
+  if (process.env.NODE_ENV !== "production" && devMemoComputeDepth !== 0) {
+    console.error(
+      "Do not call use() inside a useMemo() factory. Cached factories can skip context or promise reads; call use() before useMemo() and memoize the returned value instead."
+    );
+  }
   if (usable && usable.$$kind === CONTEXT_TAG) {
     recordSkippedHydrationSite(SERIAL, directSite);
     return readContext(usable);
@@ -3214,18 +3328,21 @@ function resolveLazyModule(mod) {
   }
   return comp;
 }
-function callLazyComponent(mod, props, scope, extra) {
-  const comp = resolveLazyModule(mod);
-  return comp((0, import_shared_value_helpers.resolveLazyDefaultProps)(comp, props), scope, extra);
-}
 function lazy(load) {
   let status = "uninitialized";
   let result = null;
   let promise = null;
   const key = "|lazy#" + LAZY_ID++;
+  let displayName;
+  let resolvedName = "Lazy";
+  const callResolved = (props, scope, extra) => {
+    const comp = resolveLazyModule(result);
+    resolvedName = comp.displayName || comp.name || "Lazy";
+    return comp((0, import_shared_value_helpers.resolveLazyDefaultProps)(comp, props), scope, extra);
+  };
   const lazyWrapper = (props, scope, extra) => {
     if (status === "fulfilled") {
-      return callLazyComponent(result, props, scope, extra);
+      return callResolved(props, scope, extra);
     }
     if (status === "rejected") throw result;
     if (status === "uninitialized") {
@@ -3253,7 +3370,7 @@ function lazy(load) {
       if (status === "uninitialized") status = "pending";
       const settledStatus = status;
       if (settledStatus === "fulfilled") {
-        return callLazyComponent(result, props, scope, extra);
+        return callResolved(props, scope, extra);
       }
       if (settledStatus === "rejected") throw result;
     }
@@ -3270,11 +3387,22 @@ function lazy(load) {
     }
     throw SSR_SUSPENSE;
   };
-  Object.defineProperty(lazyWrapper, LAZY_COMPONENT, { value: true });
+  Object.defineProperty(lazyWrapper, LAZY_COMPONENT, {
+    get() {
+      return this === lazyWrapper;
+    }
+  });
+  Object.defineProperty(lazyWrapper, "displayName", {
+    configurable: true,
+    get: () => displayName ?? resolvedName,
+    set: (value) => {
+      displayName = value;
+    }
+  });
   return lazyWrapper;
 }
 function useState(initial, slot) {
-  if (slot === void 0 && typeof initial === "symbol") {
+  if (slot === void 0 && typeof initial === "symbol" && arguments.length === 1 && (HOOK_SLOT_PATH.length === 0 || MANUAL_HOOK_DRIVER?.active === true)) {
     slot = initial;
     initial = void 0;
   }
@@ -3285,7 +3413,7 @@ function useState(initial, slot) {
   );
 }
 function __useStateWithGetter(initial, slot) {
-  if (slot === void 0 && typeof initial === "symbol") {
+  if (slot === void 0 && typeof initial === "symbol" && arguments.length === 1 && (HOOK_SLOT_PATH.length === 0 || MANUAL_HOOK_DRIVER?.active === true)) {
     slot = initial;
     initial = void 0;
   }
@@ -3377,30 +3505,43 @@ const useLayoutEffect = useEffect;
 const useInsertionEffect = useEffect;
 function useImperativeHandle() {
 }
+let devMemoComputeDepth = 0;
 function memoHookValue(input, compute, depsOrSlot, maybeSlot) {
   const deps = Array.isArray(depsOrSlot) ? depsOrSlot : null;
   const slot = maybeSlot ?? (Array.isArray(depsOrSlot) || depsOrSlot === null ? void 0 : depsOrSlot);
   if (deps === null) return compute ? input() : input;
   const position = hookPosition(slot);
-  if (position === null) return compute ? input() : input;
+  if (position === null)
+    return compute ? input(...deps) : input;
   let rec = position.list[position.index];
   if (rec === void 0) {
-    rec = { value: compute ? input() : input, deps: deps.slice() };
+    rec = {
+      value: compute ? input(...deps) : input,
+      deps: deps.slice()
+    };
     position.list[position.index] = rec;
   } else if (!serverDepsEqual(rec.deps, deps)) {
-    rec.value = compute ? input() : input;
+    rec.value = compute ? input(...deps) : input;
     rec.deps = deps.slice();
   }
   return rec.value;
 }
 function useMemo(compute, depsOrSlot, maybeSlot) {
+  if (process.env.NODE_ENV !== "production") {
+    devMemoComputeDepth++;
+    try {
+      return memoHookValue(compute, true, depsOrSlot, maybeSlot);
+    } finally {
+      devMemoComputeDepth--;
+    }
+  }
   return memoHookValue(compute, true, depsOrSlot, maybeSlot);
 }
 function useCallback(fn, depsOrSlot, maybeSlot) {
   return memoHookValue(fn, false, depsOrSlot, maybeSlot);
 }
 function useRef(initial, slot) {
-  if (slot === void 0 && typeof initial === "symbol") {
+  if (slot === void 0 && typeof initial === "symbol" && arguments.length === 1 && (HOOK_SLOT_PATH.length === 0 || MANUAL_HOOK_DRIVER?.active === true)) {
     slot = initial;
     initial = void 0;
   }
@@ -3440,20 +3581,102 @@ function useActionState(_action, initialState) {
   return [initialState, NOOP, false];
 }
 function useFormStatus() {
-  return { pending: false, data: null, method: "get", action: null };
+  return { pending: false, data: null, method: null, action: null };
 }
 function useOptimistic(state) {
   return [state, NOOP];
 }
 function memo(component) {
+  const memoWrapper = (props, scope, extra) => component(props, scope, extra);
+  Object.defineProperty(memoWrapper, "type", { value: component });
+  Object.defineProperty(memoWrapper, "displayName", {
+    configurable: true,
+    writable: true,
+    value: component.displayName || component.name || "Memo"
+  });
+  Object.defineProperty(memoWrapper, "__memo", {
+    get() {
+      return this === memoWrapper;
+    }
+  });
+  Object.defineProperty(memoWrapper, "defaultProps", {
+    configurable: true,
+    get: () => component.defaultProps,
+    set: (value) => {
+      component.defaultProps = value;
+    }
+  });
+  return memoWrapper;
+}
+function markWarm(component, plan) {
+  Object.defineProperty(component, "__warm", {
+    configurable: true,
+    get() {
+      return this === component ? plan : void 0;
+    }
+  });
   return component;
 }
+let MANUAL_HOOK_DRIVER = null;
+function invokeManualHook(fn, receiver, args) {
+  const driver = MANUAL_HOOK_DRIVER ??= {
+    pending: HOOK_SLOT_PATH[HOOK_SLOT_PATH.length - 1],
+    active: false
+  };
+  const pending = driver.pending;
+  const active = driver.active;
+  driver.pending = void 0;
+  driver.active = true;
+  try {
+    if (pending === void 0) return Reflect.apply(fn, receiver, args);
+    switch (args.length) {
+      case 0:
+        return fn.call(receiver, pending);
+      case 1:
+        return fn.call(receiver, args[0], pending);
+      case 2:
+        return fn.call(receiver, args[0], args[1], pending);
+      case 3:
+        return fn.call(receiver, args[0], args[1], args[2], pending);
+      case 4:
+        return fn.call(receiver, args[0], args[1], args[2], args[3], pending);
+      default: {
+        const forwarded = new Array(args.length + 1);
+        for (let index = 0; index < args.length; index++) forwarded[index] = args[index];
+        forwarded[args.length] = pending;
+        return fn.apply(receiver, forwarded);
+      }
+    }
+  } finally {
+    driver.pending = pending;
+    driver.active = active;
+  }
+}
+function manualHook(fn, name) {
+  function provider() {
+    return invokeManualHook(fn, this, arguments);
+  }
+  Object.defineProperty(provider, "name", { value: name ?? fn.name, configurable: true });
+  Object.defineProperty(provider, "length", { value: fn.length, configurable: true });
+  return provider;
+}
 function withSlot(sym, fn, ...args) {
+  const driver = MANUAL_HOOK_DRIVER;
+  const pending = driver?.pending;
+  const active = driver?.active ?? false;
+  if (driver !== null) {
+    driver.pending = sym;
+    driver.active = false;
+  }
   HOOK_SLOT_PATH.push(sym);
   try {
     return fn(...args);
   } finally {
     HOOK_SLOT_PATH.pop();
+    if (MANUAL_HOOK_DRIVER !== null) {
+      MANUAL_HOOK_DRIVER.pending = driver === null ? HOOK_SLOT_PATH[HOOK_SLOT_PATH.length - 1] : pending;
+      MANUAL_HOOK_DRIVER.active = active;
+    }
   }
 }
 function startTransition(fn) {
@@ -3478,6 +3701,28 @@ function isChildrenBlock(value) {
 function injectStyle(id, css, nonce) {
   if (CSS !== null) CSS.set(id, nonce === void 0 ? { css } : { css, nonce });
 }
+function styleMap(id, css, map, applied = []) {
+  let touching = false;
+  const touch = () => {
+    if (CSS === null || touching) return;
+    touching = true;
+    try {
+      for (const dependency of applied) touchStyleMap(dependency);
+      if (id !== null && css !== null) injectStyle(id, css);
+    } finally {
+      touching = false;
+    }
+  };
+  return new Proxy(map, {
+    get(target, key, receiver) {
+      touch();
+      return Reflect.get(target, key, receiver);
+    }
+  });
+}
+function touchStyleMap(map) {
+  if (map !== null && typeof map === "object") void map.$class;
+}
 const HEAD_VOID_ELEMENTS = /* @__PURE__ */ new Set(["meta", "link", "base"]);
 function ssrHeadEl(key, tag, attrs, text) {
   if (HEAD === null || FALLBACK_HOIST_DEPTH !== 0) return "";
@@ -3530,11 +3775,20 @@ function namespaceHeadElement(headKey, tag, attrs, text, authoredKey) {
   return createElement(namespaceHead, config);
 }
 function spliceHead(body, head) {
-  if (head === "") return body;
+  if (head === "" && !isDocumentRoot(body)) return body;
   const headClose = body.indexOf("</head>");
   if (headClose !== -1) return body.slice(0, headClose) + head + body.slice(headClose);
+  if (isDocumentRoot(body)) {
+    const openingEnd = documentTagEnd(body, body.indexOf("<html") + 5);
+    if (openingEnd !== -1)
+      return body.slice(0, openingEnd) + "<head>" + head + "</head>" + body.slice(openingEnd);
+  }
+  if (head === "") return body;
   return head + body;
 }
+function renderEntryValue(props, scope) {
+  return ssrHtml(ssrChild(props.value, scope));
+}
 const MAX_SUSPENSE_PASSES = 50;
 let SUSPENSE_TIMEOUT_MS = 1e4;
 function setSsrSuspenseTimeout(ms) {
@@ -3801,7 +4055,7 @@ function runFullFramedPass(component, props, resolved, nonceAttr = "", identifie
   const nativeToken = NATIVE_READ_COLLECTOR === null ? -1 : beginActiveNativeReadScope(root);
   try {
     const out = invokeComponentBody(component, props, root, FRAME);
-    body = typeof out === "string" ? out : out == null ? "" : ssrChild(out, root);
+    body = serverComponentOutput(out, root);
     nativePassCompleted = true;
   } catch (err) {
     err = normalizeThrownServerThenable(err);
@@ -3817,6 +4071,14 @@ function runFullFramedPass(component, props, resolved, nonceAttr = "", identifie
       restoreAmbient(saved);
     }
   }
+  if (resolved.bufferedErrors !== void 0) {
+    for (const report of resolved.bufferedErrors.values()) {
+      if (!report.reported) {
+        report.reported = true;
+        resolved.resourceOptions?.onError?.(report.error);
+      }
+    }
+  }
   let css = "";
   for (const [hash, sheet] of cssMap) {
     css += '<style data-octane="' + hash + '"' + (sheet.nonce === void 0 ? nonceAttr : ' nonce="' + escapeAttr(sheet.nonce) + '"') + ">" + escapeEntireInlineStyleContent(sheet.css) + "</style>";
@@ -4094,7 +4356,11 @@ function passToResult(pass, nonceAttr, separateHead = false) {
   return result;
 }
 async function prerender(entryComponent, props, options) {
-  const component = entryComponent;
+  const component = typeof entryComponent === "function" ? entryComponent : renderEntryValue;
+  if (typeof entryComponent !== "function") {
+    options ??= props;
+    props = { value: entryComponent };
+  }
   const nonceAttr = nonceAttrOf(options);
   const resolved = newResolvedMap(options ?? null);
   try {
@@ -4108,6 +4374,10 @@ async function prerender(entryComponent, props, options) {
   }
 }
 async function prerenderToNodeStream(entryComponent, props, options) {
+  if (typeof entryComponent !== "function" && options === void 0) {
+    options = props;
+    props = void 0;
+  }
   let resolved = options;
   if (options?.headChannel === "separate") {
     if (process.env.NODE_ENV !== "production") {
@@ -4192,7 +4462,11 @@ function renderHostedAttempt(session, component, props, options) {
   return { status: "complete", html: body, head: pass.head, cssEntries: pass.cssEntries };
 }
 function renderToString(entryComponent, props, options) {
-  const component = entryComponent;
+  const component = typeof entryComponent === "function" ? entryComponent : renderEntryValue;
+  if (typeof entryComponent !== "function") {
+    options ??= props;
+    props = { value: entryComponent };
+  }
   options?.signal?.throwIfAborted();
   const nonceAttr = nonceAttrOf(options);
   const resolved = newResolvedMap(options ?? null);
@@ -4202,6 +4476,7 @@ function renderToString(entryComponent, props, options) {
       null,
       () => runFullFramedPass(component, props, resolved, nonceAttr, options?.identifierPrefix ?? "")
     );
+    if (pass.rootSuspended) throw new Error((0, import_error_codes_server_generated.formatServerError)(60));
   } catch (err) {
     options?.onError?.(err);
     throw err;
@@ -4211,7 +4486,11 @@ function renderToString(entryComponent, props, options) {
   return passToResult(pass, nonceAttr, options?.headChannel === "separate");
 }
 function renderToStaticMarkup(entryComponent, props, options) {
-  const component = entryComponent;
+  const component = typeof entryComponent === "function" ? entryComponent : renderEntryValue;
+  if (typeof entryComponent !== "function") {
+    options ??= props;
+    props = { value: entryComponent };
+  }
   options?.signal?.throwIfAborted();
   const nonceAttr = nonceAttrOf(options);
   const resolved = newResolvedMap(options ?? null);
@@ -4228,6 +4507,7 @@ function renderToStaticMarkup(entryComponent, props, options) {
         false
       )
     );
+    if (pass.rootSuspended) throw new Error((0, import_error_codes_server_generated.formatServerError)(60));
   } catch (err) {
     options?.onError?.(err);
     throw err;
@@ -4321,7 +4601,7 @@ function pruneStreamBoundariesAbsentFromShell(stream, shellBoundaryKeys) {
     if (!shellBoundaryKeys.has(key)) stream.boundaries.delete(key);
   }
 }
-function ssrTry(scope, siteKey, tryFn, pendFn, catchFn, namespace = FRAME?.namespace ?? "html", propagateSuspense = false) {
+function ssrTry(scope, siteKey, tryFn, pendFn, catchFn, namespace = FRAME?.namespace ?? "html", propagateSuspense = false, recoverErrors = false) {
   VT_SSR_TRY_SEQ++;
   let vtOuter = null;
   if (VT_SSR_STACK.length > 0) {
@@ -4674,6 +4954,13 @@ function ssrTry(scope, siteKey, tryFn, pendFn, catchFn, namespace = FRAME?.names
         pruneUnrepresentedStreamDescendants(stream, key, fallback);
         return fallback;
       }
+      if (recoverErrors && pendFn !== null && PERMANENT_STATIC_HYDRATE_DEPTH === 0) {
+        if (SERIAL !== null) SERIAL.length = serialStart;
+        const reports = RESOLVED?.bufferedErrors ?? (RESOLVED.bufferedErrors = /* @__PURE__ */ new Map());
+        if (!reports.has(key)) reports.set(key, { error: e, reported: false });
+        nativeFresh = true;
+        return pendingForm();
+      }
       throw e;
     }
   } finally {
@@ -4715,19 +5002,22 @@ function documentHeadInsertionPoint(body) {
     const next = body.charCodeAt(start + 5);
     if (next === 62) return start + 6;
     if (next === 32 || next === 9 || next === 10 || next === 13) {
-      let quote = 0;
-      for (let i = start + 6; i < body.length; i++) {
-        const code = body.charCodeAt(i);
-        if (quote !== 0) {
-          if (code === quote) quote = 0;
-        } else if (code === 34 || code === 39) quote = code;
-        else if (code === 62) return i + 1;
-      }
-      return -1;
+      return documentTagEnd(body, start + 6);
     }
     searchFrom = start + 5;
   }
 }
+function documentTagEnd(body, from) {
+  let quote = 0;
+  for (let i = from; i < body.length; i++) {
+    const code = body.charCodeAt(i);
+    if (quote !== 0) {
+      if (code === quote) quote = 0;
+    } else if (code === 34 || code === 39) quote = code;
+    else if (code === 62) return i + 1;
+  }
+  return -1;
+}
 function segmentChunk(b, nonceAttr) {
   let seedScript = "";
   if (b.seeds.length > 0) {
@@ -4786,19 +5076,30 @@ async function runStream(component, props, options, sink, resolved) {
   };
   const injection = options?.injection;
   if (injection !== void 0) injection.done.then(NOOP, NOOP);
+  let injectionCompleted = false;
+  const completeInjection = injection === void 0 ? NOOP : () => {
+    if (injectionCompleted) return;
+    injectionCompleted = true;
+    injection.renderComplete?.();
+  };
   let injectionUnsubscribe;
   let injectionFailure;
   let injectionFailed = false;
+  const unacceptedInjection = injection === void 0 ? void 0 : [];
+  const rememberUnaccepted = injection === void 0 ? NOOP : (chunk) => {
+    unacceptedInjection.push(chunk);
+  };
   let signalInjectionFailure;
   const failInjection = (err) => {
+    if (signal?.aborted && err === signal.reason) return;
     if (injectionFailed) return;
     injectionFailed = true;
     injectionFailure = err;
     signalInjectionFailure?.();
   };
   let writeChain = injection === void 0 ? null : Promise.resolve();
-  const write = injection === void 0 ? (chunk, terminal) => sink.write(chunk, terminal) : (chunk, terminal) => {
-    const operation = writeChain.then(() => sink.write(chunk, terminal));
+  const write = injection === void 0 ? (chunk, terminal) => sink.write(chunk, terminal) : (chunk, terminal, onUnaccepted) => {
+    const operation = writeChain.then(() => sink.write(chunk, terminal, onUnaccepted));
     writeChain = operation.then(NOOP, NOOP);
     return operation;
   };
@@ -4812,11 +5113,34 @@ async function runStream(component, props, options, sink, resolved) {
       return;
     }
     if (!html) return;
-    return write(html);
+    return write(html, false, rememberUnaccepted);
+  };
+  const recoveryInjection = injection === void 0 ? void 0 : async () => {
+    if (signal?.aborted) {
+      await writeChain;
+      for (const html of unacceptedInjection) {
+        const replay = write(html, "recovery");
+        if (replay !== void 0) await replay;
+      }
+      unacceptedInjection.length = 0;
+    }
+    if (injectionFailed) return "";
+    let queued;
+    try {
+      queued = injection.take();
+    } catch {
+      return "";
+    }
+    if (queued !== "" && signal?.aborted) {
+      const replay = write(queued, "recovery");
+      if (replay !== void 0) await replay;
+      return "";
+    }
+    return queued;
   };
   const notifyInjection = () => {
     const drained = drainInjection();
-    if (drained !== void 0) drained.catch(NOOP);
+    if (drained !== void 0) drained.catch(failInjection);
   };
   const waitForInjectionDone = () => new Promise((resolve, reject) => {
     let settled = false;
@@ -4919,12 +5243,24 @@ async function runStream(component, props, options, sink, resolved) {
     }
     pruneStreamBoundariesAbsentFromShell(stream, shellBoundaryKeys);
   } catch (err) {
+    try {
+      completeInjection();
+    } catch {
+    }
     const reports = signal?.aborted ? Math.max(1, preShellSuspended.length) : 1;
     for (let i = 0; i < reports; i++) options?.onError?.(err);
     sink.shellError(err);
     return;
   }
-  reportRecoverableBoundaryErrors();
+  try {
+    reportRecoverableBoundaryErrors();
+  } catch (err) {
+    try {
+      completeInjection();
+    } catch {
+    }
+    throw err;
+  }
   if (pass.sheets !== null) for (const key of pass.sheets.keys()) flushedSheets.add(key);
   let leadingStyles = "";
   for (const [hash, sheet] of pass.cssEntries) {
@@ -4932,7 +5268,17 @@ async function runStream(component, props, options, sink, resolved) {
     leadingStyles += '<style data-octane="' + hash + '"' + (sheet.nonce === void 0 ? nonceAttr : ' nonce="' + escapeAttr(sheet.nonce) + '"') + ">" + escapeEntireInlineStyleContent(sheet.css) + "</style>";
   }
   const separateHead = options?.headChannel === "separate";
-  if (separateHead) options?.onHeadReady?.(pass.vtCandidates ? vtSsrStrip(pass.head) : pass.head);
+  if (separateHead) {
+    try {
+      options?.onHeadReady?.(pass.vtCandidates ? vtSsrStrip(pass.head) : pass.head);
+    } catch (err) {
+      try {
+        completeInjection();
+      } catch {
+      }
+      throw err;
+    }
+  }
   const shellHead = separateHead ? "" : pass.head;
   const documentRoot = isDocumentRoot(pass.body);
   let shell = documentRoot ? "<!DOCTYPE html>" : "";
@@ -4941,14 +5287,14 @@ async function runStream(component, props, options, sink, resolved) {
     const tailStart = documentTailStart(pass.body);
     if (tailStart !== -1) {
       heldDocumentTail = pass.body.slice(tailStart);
-      const bodyHtml = pass.body.slice(0, tailStart);
+      const bodyHtml = spliceHead(pass.body.slice(0, tailStart), "");
       const headInsert = documentHeadInsertionPoint(bodyHtml);
       shell += headInsert !== -1 ? bodyHtml.slice(0, headInsert) + leadingStyles + shellHead + bodyHtml.slice(headInsert) : leadingStyles + shellHead + bodyHtml;
     } else {
-      shell += leadingStyles + shellHead + pass.body;
+      shell += spliceHead(pass.body, leadingStyles + shellHead);
     }
   } else {
-    shell += leadingStyles + shellHead + pass.body;
+    shell += documentRoot ? spliceHead(pass.body, leadingStyles + shellHead) : leadingStyles + shellHead + pass.body;
   }
   if (pass.serial.length > 0) shell += serializeSuspenseSeeds(pass.serial, nonceAttr);
   if (pass.signals !== void 0) shell += serializeNativeSignalSeeds(pass.signals, nonceAttr);
@@ -4959,11 +5305,23 @@ async function runStream(component, props, options, sink, resolved) {
     const shellWrite = write(pass.vtCandidates ? vtSsrStrip(shell) : shell);
     if (shellWrite !== void 0) await shellWrite;
   } catch (err) {
+    try {
+      completeInjection();
+    } catch {
+    }
     options?.onError?.(err);
     sink.shellError(err);
     return;
   }
-  sink.shellReady();
+  try {
+    sink.shellReady();
+  } catch (err) {
+    try {
+      completeInjection();
+    } catch {
+    }
+    throw err;
+  }
   if (injection !== void 0) {
     try {
       injectionUnsubscribe = injection.subscribe(notifyInjection);
@@ -5053,14 +5411,14 @@ async function runStream(component, props, options, sink, resolved) {
       injectionUnsubscribe?.();
       injectionUnsubscribe = void 0;
       try {
-        injection.renderComplete?.();
+        completeInjection();
       } catch {
       }
     }
     let tail = "";
-    if (injection !== void 0 && !injectionFailed) {
+    if (recoveryInjection !== void 0) {
       try {
-        tail += injection.take();
+        tail = await recoveryInjection();
       } catch {
       }
     }
@@ -5080,7 +5438,7 @@ async function runStream(component, props, options, sink, resolved) {
   }
   if (injection !== void 0) {
     try {
-      injection.renderComplete?.();
+      completeInjection();
     } catch (err) {
       failInjection(err);
     }
@@ -5088,11 +5446,14 @@ async function runStream(component, props, options, sink, resolved) {
       await waitForInjectionDone();
       const finalDrain = drainInjection();
       if (finalDrain !== void 0) await finalDrain;
+      await writeChain;
       if (injectionFailed) throw injectionFailure;
       if (heldDocumentTail !== "") {
         const tailChunk = heldDocumentTail;
         heldDocumentTail = "";
-        const tailWrite = write(tailChunk);
+        const tailWrite = write(tailChunk, false, (unaccepted) => {
+          heldDocumentTail = unaccepted;
+        });
         if (tailWrite !== void 0) await tailWrite;
       }
     } catch (err) {
@@ -5100,11 +5461,9 @@ async function runStream(component, props, options, sink, resolved) {
       injectionUnsubscribe?.();
       injectionUnsubscribe = void 0;
       let terminal = "";
-      if (!injectionFailed) {
-        try {
-          terminal = injection.take();
-        } catch {
-        }
+      try {
+        terminal = await recoveryInjection();
+      } catch {
       }
       terminal += heldDocumentTail;
       if (terminal !== "") {
@@ -5122,7 +5481,11 @@ async function runStream(component, props, options, sink, resolved) {
   sink.allReady();
 }
 function renderToPipeableStream(entryComponent, props, options) {
-  const component = entryComponent;
+  const component = typeof entryComponent === "function" ? entryComponent : renderEntryValue;
+  if (typeof entryComponent !== "function") {
+    options ??= props;
+    props = { value: entryComponent };
+  }
   const controller = new AbortController();
   let removeOuterAbort;
   if (options?.signal) {
@@ -5141,6 +5504,7 @@ function renderToPipeableStream(entryComponent, props, options) {
   let endCalled = false;
   let pipeCalled = false;
   let writeGate = null;
+  let shellFailure = null;
   const destinationFailure = (reason) => {
     if (closed) return;
     closed = true;
@@ -5154,12 +5518,18 @@ function renderToPipeableStream(entryComponent, props, options) {
     if (!ended || destination === null || writeGate !== null || endCalled || closed) return;
     endCalled = true;
     try {
+      if (shellFailure !== null && destination.destroy !== void 0) {
+        closed = true;
+        destination.destroy(shellFailure.error);
+        return;
+      }
       destination.end();
     } catch (err) {
       destinationFailure(err);
     }
   };
-  const waitForDrain = (dest) => {
+  const waitForDrain = (dest, allowAborted = false) => {
+    if (allowAborted && closed) return Promise.reject(new Error((0, import_error_codes_server_generated.formatServerError)(38)));
     if (dest.once === void 0) {
       return Promise.reject(new TypeError((0, import_error_codes_server_generated.formatServerError)(39)));
     }
@@ -5195,14 +5565,17 @@ function renderToPipeableStream(entryComponent, props, options) {
       dest.once("drain", onDrain);
       dest.once("error", onError);
       dest.once("close", onClose);
-      if (controller.signal.aborted) onAbort();
-      else controller.signal.addEventListener("abort", onAbort, { once: true });
+      if (!allowAborted) {
+        if (controller.signal.aborted) onAbort();
+        else controller.signal.addEventListener("abort", onAbort, { once: true });
+      }
     });
   };
-  const writeNow = (chunk, terminal) => {
+  const writeNow = (chunk, terminal, onUnaccepted) => {
     const dest = destination;
     if (closed) return Promise.reject(new Error((0, import_error_codes_server_generated.formatServerError)(40)));
-    if (!terminal && controller.signal.aborted) {
+    if (terminal === false && controller.signal.aborted) {
+      onUnaccepted?.(chunk);
       return Promise.reject(controller.signal.reason);
     }
     let accepted;
@@ -5212,7 +5585,7 @@ function renderToPipeableStream(entryComponent, props, options) {
       destinationFailure(err);
       return Promise.reject(err);
     }
-    return accepted === false && !terminal ? waitForDrain(dest) : void 0;
+    return accepted === false && terminal !== true ? waitForDrain(dest, terminal === "recovery") : void 0;
   };
   const trackWrite = (operation) => {
     const gate = operation.then(
@@ -5233,16 +5606,18 @@ function renderToPipeableStream(entryComponent, props, options) {
     });
     return operation;
   };
-  const queueWrite = (chunk, terminal = false) => {
+  const queueWrite = (chunk, terminal = false, onUnaccepted) => {
     if (destination === null) {
-      buffered.push({ chunk, terminal });
+      buffered.push(
+        onUnaccepted === void 0 ? { chunk, terminal } : { chunk, terminal, onUnaccepted }
+      );
       return;
     }
     if (writeGate !== null) {
-      const operation2 = writeGate.then(() => writeNow(chunk, terminal));
+      const operation2 = writeGate.then(() => writeNow(chunk, terminal, onUnaccepted));
       return trackWrite(operation2);
     }
-    const operation = writeNow(chunk, terminal);
+    const operation = writeNow(chunk, terminal, onUnaccepted);
     return operation === void 0 ? void 0 : trackWrite(operation);
   };
   const flushEnd = () => {
@@ -5262,14 +5637,15 @@ function renderToPipeableStream(entryComponent, props, options) {
       props,
       renderOptions,
       {
-        write(chunk, terminal) {
-          return queueWrite(chunk, terminal);
+        write(chunk, terminal, onUnaccepted) {
+          return queueWrite(chunk, terminal, onUnaccepted);
         },
         shellReady() {
           options?.onShellReady?.();
         },
         shellError(err) {
           releaseServerRenderResources(resolved);
+          shellFailure = { error: err };
           options?.onShellError?.(err);
           flushEnd();
         },
@@ -5306,7 +5682,11 @@ function renderToPipeableStream(entryComponent, props, options) {
         });
       }
       for (const item of buffered) {
-        queueWrite(item.chunk, item.terminal || controller.signal.aborted);
+        queueWrite(
+          item.chunk,
+          item.terminal === "recovery" ? "recovery" : item.terminal || controller.signal.aborted,
+          item.onUnaccepted
+        );
       }
       buffered.length = 0;
       finishEnd();
@@ -5318,7 +5698,11 @@ function renderToPipeableStream(entryComponent, props, options) {
   };
 }
 function renderToReadableStream(entryComponent, props, options) {
-  const component = entryComponent;
+  const component = typeof entryComponent === "function" ? entryComponent : renderEntryValue;
+  if (typeof entryComponent !== "function") {
+    options ??= props;
+    props = { value: entryComponent };
+  }
   return new Promise((resolveShell, rejectShell) => {
     const encoder = new TextEncoder();
     const renderController = new AbortController();
@@ -5368,7 +5752,10 @@ function renderToReadableStream(entryComponent, props, options) {
     });
     stream.allReady = allReady;
     let shellDone = false;
-    const waitForDemand = () => new Promise((resolve, reject) => {
+    let terminal = false;
+    let released = false;
+    let callbackFailure;
+    const waitForDemand = (allowAborted = false) => new Promise((resolve, reject) => {
       let settled = false;
       const cleanup = () => {
         renderController.signal.removeEventListener("abort", onAbort);
@@ -5383,18 +5770,21 @@ function renderToReadableStream(entryComponent, props, options) {
       const onDemand = () => finish(resolve);
       const onAbort = () => finish(() => reject(renderController.signal.reason));
       wakeDemand = onDemand;
-      if (renderController.signal.aborted) onAbort();
-      else renderController.signal.addEventListener("abort", onAbort, { once: true });
+      if (!allowAborted) {
+        if (renderController.signal.aborted) onAbort();
+        else renderController.signal.addEventListener("abort", onAbort, { once: true });
+      }
     });
-    const writeReadable = (chunk, terminal = false) => {
+    const writeReadable = (chunk, terminal2 = false, onUnaccepted) => {
       if (closed || consumerCancelled) {
         return Promise.reject(cancelReason ?? new Error((0, import_error_codes_server_generated.formatServerError)(44)));
       }
-      if (!terminal && renderController.signal.aborted) {
+      if (terminal2 === false && renderController.signal.aborted) {
+        onUnaccepted?.(chunk);
         return Promise.reject(renderController.signal.reason);
       }
       const bytes = encoder.encode(chunk);
-      if (terminal) {
+      if (terminal2 === true) {
         readableController.enqueue(bytes);
         return;
       }
@@ -5403,13 +5793,18 @@ function renderToReadableStream(entryComponent, props, options) {
         return;
       }
       return (async () => {
-        while ((readableController.desiredSize ?? 0) <= 0) {
-          await waitForDemand();
-          if (closed || consumerCancelled) {
-            throw cancelReason ?? new Error((0, import_error_codes_server_generated.formatServerError)(44));
+        try {
+          while ((readableController.desiredSize ?? 0) <= 0) {
+            await waitForDemand(terminal2 === "recovery");
+            if (closed || consumerCancelled) {
+              throw cancelReason ?? new Error((0, import_error_codes_server_generated.formatServerError)(44));
+            }
           }
+          readableController.enqueue(bytes);
+        } catch (err) {
+          if (!consumerCancelled && renderController.signal.aborted) onUnaccepted?.(chunk);
+          throw err;
         }
-        readableController.enqueue(bytes);
       })();
     };
     const closeReadable = () => {
@@ -5423,46 +5818,80 @@ function renderToReadableStream(entryComponent, props, options) {
       }
     };
     const renderOptions = { ...options, signal: renderController.signal };
+    if (options?.onError !== void 0) {
+      renderOptions.onError = (error) => {
+        try {
+          options.onError(error);
+        } catch (err) {
+          callbackFailure ??= { error: err };
+        }
+      };
+    }
     const resolved = newResolvedMap(renderOptions);
+    const release = () => {
+      if (released) return;
+      released = true;
+      releaseServerRenderResources(resolved);
+    };
+    const settleFailure = (error) => {
+      if (terminal) return;
+      terminal = true;
+      try {
+        release();
+      } catch (err) {
+        error = err;
+      }
+      const reason = callbackFailure === void 0 ? error : callbackFailure.error;
+      if (!shellDone) rejectShell(reason);
+      allReadyReject(reason);
+      closeReadable();
+    };
     runStream(
       component,
       props,
       renderOptions,
       {
-        write(chunk, terminal) {
-          return writeReadable(chunk, terminal);
+        write(chunk, terminal2, onUnaccepted) {
+          return writeReadable(chunk, terminal2, onUnaccepted);
         },
         shellReady() {
-          shellDone = true;
           options?.onShellReady?.();
+          shellDone = true;
           resolveShell(stream);
         },
         shellError(err) {
-          releaseServerRenderResources(resolved);
-          options?.onShellError?.(err);
-          if (!shellDone) rejectShell(err);
-          allReadyReject(err);
-          closeReadable();
+          try {
+            release();
+            options?.onShellError?.(err);
+          } catch (callbackError) {
+            settleFailure(callbackError);
+            return;
+          }
+          settleFailure(err);
         },
         allReady() {
-          releaseServerRenderResources(resolved);
-          options?.onAllReady?.();
-          allReadyResolve();
+          if (terminal) return;
+          try {
+            release();
+            options?.onAllReady?.();
+          } catch (err) {
+            renderOptions.onError?.(err);
+            settleFailure(err);
+            return;
+          }
+          terminal = true;
+          if (callbackFailure === void 0) allReadyResolve();
+          else allReadyReject(callbackFailure.error);
           closeReadable();
         },
         fatal(err) {
-          releaseServerRenderResources(resolved);
-          allReadyReject(err);
-          closeReadable();
+          settleFailure(err);
         }
       },
       resolved
     ).catch((err) => {
-      releaseServerRenderResources(resolved);
-      options?.onError?.(err);
-      if (!shellDone) rejectShell(err);
-      allReadyReject(err);
-      closeReadable();
+      renderOptions.onError?.(err);
+      settleFailure(err);
     });
   });
 }
@@ -5768,11 +6197,14 @@ function preinitModule(href, options) {
   getSsrSuspenseTimeout,
   hookSlots,
   injectStyle,
+  invokeManualHook,
   isChildrenBlock,
   isValidElement,
   lazy,
+  manualHook,
   mapSlot,
   markChildrenBlock,
+  markWarm,
   memo,
   namespaceHead,
   namespaceHeadElement,
@@ -5808,7 +6240,9 @@ function preinitModule(href, options) {
   ssrBlock,
   ssrCheckedAttr,
   ssrChild,
+  ssrChildPre,
   ssrChildText,
+  ssrChildTextPre,
   ssrChildrenSources,
   ssrClass,
   ssrComponent,
@@ -5819,6 +6253,7 @@ function preinitModule(href, options) {
   ssrFormAuthoringDiagnostics,
   ssrFragmentMarker,
   ssrHeadEl,
+  ssrHtml,
   ssrInNamespace,
   ssrInnerHtml,
   ssrInputAttrs,
@@ -5846,6 +6281,8 @@ function preinitModule(href, options) {
   ssrValueAttr,
   ssrVoidContent,
   startTransition,
+  styleMap,
+  touchStyleMap,
   use,
   useActionState,
   useCallback,