octane 0.3.6 → 0.4.1

package/dist/cjs/host-property-diagnostics.cjs

@@ -149,6 +149,21 @@ for (const name of [
 ]) {
   KNOWN_SVG_PROPERTY_SPELLINGS.set(name.toLowerCase(), name);
 }
+const NON_NATIVE_LOWERCASE_PROPERTIES = /* @__PURE__ */ new Set([
+  "autoFocus",
+  "defaultValue",
+  "defaultChecked",
+  "dangerouslySetInnerHTML",
+  "className",
+  "suppressContentEditableWarning",
+  "suppressHydrationWarning",
+  "suppressNativeChangeWarning",
+  "__octaneNativeChangeDiagnostic",
+  "acceptCharset",
+  "htmlFor",
+  "httpEquiv",
+  "viewBox"
+]);
 function hostPropertyWarning(name, value, tag, isSvg = false) {
   const lower = name.toLowerCase();
   if (name === "for" && tag === "label") return null;
@@ -164,6 +179,9 @@ function hostPropertyWarning(name, value, tag, isSvg = false) {
   if (name.startsWith("aria-") || /^aria[A-Z]/.test(name) || name.startsWith("data-")) return null;
   const known = KNOWN_PROPERTY_SPELLINGS.get(lower) ?? (isSvg ? KNOWN_SVG_PROPERTY_SPELLINGS.get(lower) : void 0);
   if (known !== void 0) {
+    if (!isSvg && name === lower && // Hyphenated/namespaced presentation aliases belong to SVG, not HTML.
+    !name.includes("-") && !name.includes(":") && !NON_NATIVE_LOWERCASE_PROPERTIES.has(known) && (import_constants.ATTRIBUTE_ALIASES.get(known) ?? lower) === lower)
+      return null;
     if (isSvg && import_constants.ATTRIBUTE_ALIASES.get(known) === name) return null;
     return name !== known ? `Invalid DOM property \`${name}\`. Did you mean \`${known}\`?` : null;
   }

package/dist/cjs/index.cjs

@@ -85,6 +85,7 @@ __export(index_exports, {
   createElement: () => import_runtime.createElement,
   createHostContextRequest: () => import_runtime.createHostContextRequest,
   createPortal: () => import_runtime.createPortal,
+  createResizeObserver: () => import_resize_observer.createResizeObserver,
   createRoot: () => import_runtime.createRoot,
   createScopedElement: () => import_runtime.createScopedElement,
   createScopedValue: () => import_runtime.createScopedValue,
@@ -246,6 +247,7 @@ __export(index_exports, {
 });
 module.exports = __toCommonJS(index_exports);
 var import_trusted_html = require("./trusted-html.cjs");
+var import_resize_observer = require("./resize-observer.cjs");
 var import_version = require("./version.cjs");
 var import_compatibility = require("./compatibility.cjs");
 var import_event_capture = require("./hydration/event-capture.cjs");
@@ -325,6 +327,7 @@ var import_method_dep = require("./method-dep.cjs");
   createElement,
   createHostContextRequest,
   createPortal,
+  createResizeObserver,
   createRoot,
   createScopedElement,
   createScopedValue,

package/dist/cjs/resize-observer.cjs

@@ -0,0 +1,129 @@
+"use strict";
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+var resize_observer_exports = {};
+__export(resize_observer_exports, {
+  createResizeObserver: () => createResizeObserver
+});
+module.exports = __toCommonJS(resize_observer_exports);
+let queuedCallbacks = null;
+let postTask;
+function drainCallbacks() {
+  const callbacks = queuedCallbacks;
+  queuedCallbacks = null;
+  if (callbacks === null) return;
+  for (const callback of callbacks) {
+    try {
+      callback();
+    } catch (error) {
+      if (typeof reportError === "function") reportError(error);
+      else
+        setTimeout(() => {
+          throw error;
+        }, 0);
+    }
+  }
+}
+function enqueue(callback) {
+  if (queuedCallbacks !== null) {
+    queuedCallbacks.add(callback);
+    return;
+  }
+  queuedCallbacks = /* @__PURE__ */ new Set([callback]);
+  if (postTask === void 0) {
+    if (typeof MessageChannel === "undefined") {
+      postTask = () => {
+        setTimeout(drainCallbacks, 0);
+      };
+    } else {
+      const channel = new MessageChannel();
+      channel.port1.onmessage = drainCallbacks;
+      postTask = () => channel.port2.postMessage(null);
+    }
+  }
+  postTask();
+}
+function createResizeObserver(callback, ResizeObserverCtor = ResizeObserver) {
+  if (typeof callback !== "function")
+    throw new TypeError("ResizeObserver callback must be a function");
+  const entries = /* @__PURE__ */ new Map();
+  const boxes = /* @__PURE__ */ new Map();
+  let pending = false;
+  const deliver = () => {
+    if (!pending) return;
+    pending = false;
+    const batch = Array.from(entries.values());
+    entries.clear();
+    Reflect.apply(callback, observer, [batch, observer]);
+  };
+  const observer = new ResizeObserverCtor((batch) => {
+    pending = true;
+    for (const entry of batch) entries.set(entry.target, entry);
+    enqueue(deliver);
+  });
+  const observe = observer.observe;
+  const unobserve = observer.unobserve;
+  const disconnect = observer.disconnect;
+  const discard = (target) => {
+    if (entries.delete(target) && entries.size === 0) {
+      pending = false;
+      queuedCallbacks?.delete(deliver);
+    }
+  };
+  observer.observe = function(target, options) {
+    let box = "content-box";
+    let nativeOptions = options;
+    if (options !== null && (typeof options === "object" || typeof options === "function")) {
+      nativeOptions = {
+        get box() {
+          const value = options.box;
+          if (value === void 0) return void 0;
+          box = `${value}`;
+          return box;
+        }
+      };
+    }
+    observe.call(this, target, nativeOptions);
+    if (this !== observer) return;
+    if (boxes.get(target) !== box) discard(target);
+    boxes.set(target, box);
+  };
+  observer.unobserve = function(target) {
+    unobserve.call(this, target);
+    if (this !== observer) return;
+    boxes.delete(target);
+    discard(target);
+    if (boxes.size === 0 && entries.size === 0) {
+      pending = false;
+      queuedCallbacks?.delete(deliver);
+    }
+  };
+  observer.disconnect = function() {
+    disconnect.call(this);
+    if (this !== observer) return;
+    boxes.clear();
+    entries.clear();
+    pending = false;
+    queuedCallbacks?.delete(deliver);
+  };
+  return observer;
+}
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  createResizeObserver
+});

package/dist/cjs/runtime.cjs

@@ -403,7 +403,6 @@ let NATIVE_BLOCK_RETRIES = null;
 let NATIVE_ADOPTION_RELEASES = null;
 let SIGNAL_BINDINGS_ENABLED = false;
 const SCOPE_SIGNAL_OWNERS = /* @__PURE__ */ new WeakMap();
-const SCOPE_SIGNAL_INSTANCE_KEYS = /* @__PURE__ */ new WeakMap();
 let RETAINED_SIGNAL_OWNERS;
 const SIGNAL_RETRY_LOCATIONS = /* @__PURE__ */ new WeakMap();
 function signalRetryBoundary(block) {
@@ -604,17 +603,30 @@ function rootSignalInstanceKey(ids) {
   return JSON.stringify([ids.signalState?.prefix ?? ids.prefix, "root"]);
 }
 function resolveSignalInstanceKey(scope) {
-  const identity = SCOPE_SIGNAL_INSTANCE_KEYS.get(scope);
-  if (identity === void 0 || typeof identity === "string") return identity;
+  const resolved = scope.signalInstanceResolved;
+  if (resolved !== void 0) return resolved;
+  const parent = scope.signalInstanceParent;
+  if (parent === null) return void 0;
   const key = structuralSignalInstanceKey(
-    identity.parentScope,
-    identity.invocationSite,
-    identity.key,
-    identity.hasKey
+    parent,
+    scope.signalInstanceSite,
+    scope.signalInstanceValue,
+    scope.signalInstanceHasKey
   );
-  SCOPE_SIGNAL_INSTANCE_KEYS.set(scope, key);
+  scope.signalInstanceResolved = key;
   return key;
 }
+function stampSignalInstanceKey(scope, key) {
+  if (typeof key === "string") {
+    scope.signalInstanceResolved = key;
+    return;
+  }
+  scope.signalInstanceParent = key.parentScope;
+  scope.signalInstanceSite = key.invocationSite;
+  scope.signalInstanceValue = key.key;
+  scope.signalInstanceHasKey = key.hasKey;
+  scope.signalInstanceResolved = void 0;
+}
 function structuralSignalInstanceKey(parentScope, invocationSite, key, hasKey) {
   let base = resolveSignalInstanceKey(parentScope);
   const itemKeys = [];
@@ -645,7 +657,11 @@ function structuralSignalInstanceKey(parentScope, invocationSite, key, hasKey) {
 }
 function stampSignalInstance(scope, parentScope, invocationSite, key, hasKey) {
   if (SIGNAL_BINDINGS_ENABLED || import_document_owner.signalDocumentEnabled) {
-    SCOPE_SIGNAL_INSTANCE_KEYS.set(scope, { parentScope, invocationSite, key, hasKey });
+    scope.signalInstanceParent = parentScope;
+    scope.signalInstanceSite = invocationSite;
+    scope.signalInstanceValue = key;
+    scope.signalInstanceHasKey = hasKey;
+    scope.signalInstanceResolved = void 0;
   }
 }
 function scopeSignalOwner(scope) {
@@ -6078,14 +6094,20 @@ function drainEffectEventUpdates() {
   for (let i = 0; i < q.length; i++) {
     const entry = q[i];
     const block = entry.block;
-    if (!entry.cell.active || NATIVE_READ_DRIVER?.publicationCurrent(entry) === false || blockSubtreeDisposed(block) || // Independently scheduled siblings may complete before another child
-    // suspends their shared boundary. That boundary hides the try
-    // subtree, so its completed payload is still uncommitted. Do not use the
-    // broader inactive check: hidden Activity renders intentionally publish
-    // fresh Effect Event bodies while their DOM/effects stay preserved.
-    findSuspenseHiddenTry(block) !== null || block.effectEventRenderVersion !== entry.renderVersion || block.effectEventCompletedVersion !== entry.renderVersion) {
+    if (!entry.cell.active || NATIVE_READ_DRIVER?.publicationCurrent(entry) === false || blockSubtreeDisposed(block))
+      continue;
+    const hiddenOwner = findScheduledVisibilityOwner(block, true);
+    if (block.renderStatus !== RENDER_VALID && hiddenOwner === null) continue;
+    if (hiddenOwner !== null && hiddenOwner.__kind === "trySlotSlot") {
+      const hiddenTry = hiddenOwner;
+      deferHiddenRevealAction(hiddenTry, () => {
+        if (entry.cell.active && !blockSubtreeDisposed(block) && block.effectEventRenderVersion === entry.renderVersion && block.effectEventCompletedVersion === entry.renderVersion)
+          entry.cell.impl = entry.nextImpl;
+      });
       continue;
     }
+    if (block.effectEventRenderVersion !== entry.renderVersion || block.effectEventCompletedVersion !== entry.renderVersion)
+      continue;
     entry.cell.impl = entry.nextImpl;
   }
 }
@@ -6532,6 +6554,11 @@ class BlockImpl {
     this.__activitySlot = void 0;
     this.__warmCache = void 0;
     this.__warmCacheEpisode = void 0;
+    this.signalInstanceParent = null;
+    this.signalInstanceSite = void 0;
+    this.signalInstanceValue = void 0;
+    this.signalInstanceHasKey = false;
+    this.signalInstanceResolved = void 0;
   }
 }
 class ScopeImpl {
@@ -6551,6 +6578,11 @@ class ScopeImpl {
     this.mounted = false;
     this.slots = [];
     this.compilerMemo = null;
+    this.signalInstanceParent = null;
+    this.signalInstanceSite = void 0;
+    this.signalInstanceValue = void 0;
+    this.signalInstanceHasKey = false;
+    this.signalInstanceResolved = void 0;
   }
 }
 function createBlock(kind, parentBlock, parentNode, startMarker, endMarker, body, props, extra, outputHandler = null) {
@@ -6695,7 +6727,8 @@ function endUrgentTransitionRender(block, render) {
 }
 function renderBlockInner(block) {
   if (block.renderStatus === RENDER_INVALID) block.renderStatus = RENDER_RETRYING;
-  if (WIP_CAPTURE !== null) recordCapturedRender(WIP_CAPTURE, block);
+  if (WIP_CAPTURE !== null && WIP_CAPTURE.rootTransaction !== true)
+    recordCapturedRender(WIP_CAPTURE, block);
   if (TRANSITION_JOURNAL !== null) {
     TRANSITION_JOURNAL.push(JOURNAL_RENDER, block, null, null);
   }
@@ -6773,7 +6806,7 @@ function renderBlockInner(block) {
     if (block.outputHandler !== null && (out !== void 0 || block.slots[0]?.returnedOutput === true)) {
       block.outputHandler(block, out ?? null);
     }
-    finishEffectRender(block);
+    if (block.effectSlots !== null) finishEffectRender(block);
     if (!block.mounted) block.mounted = true;
     if (block.renderStatus === RENDER_RETRYING) block.renderStatus = RENDER_VALID;
     if (block.effectEventRenderVersion !== 0) {
@@ -7062,6 +7095,11 @@ class LiteBlockImpl {
     this.parentBlock = parentBlock;
     this.$$ctxValues = null;
     this.idState = parentBlock.idState;
+    this.signalInstanceParent = null;
+    this.signalInstanceSite = void 0;
+    this.signalInstanceValue = void 0;
+    this.signalInstanceHasKey = false;
+    this.signalInstanceResolved = void 0;
   }
 }
 function componentSlotLite(parentScope, slotKey, host, comp, props, anchor, invocationSite) {
@@ -7130,9 +7168,14 @@ function componentSlotLite(parentScope, slotKey, host, comp, props, anchor, invo
   let profileThrown;
   const nativeToken = NATIVE_READ_DRIVER === null ? -1 : beginActiveNativeReadScope(scope);
   try {
-    if (import_document_owner.signalDocumentEnabled || scope.block.idState.renderOwner?.signalOwner !== void 0)
-      runWithBlockSignalOwner(scope, () => comp(props, scope, void 0));
-    else comp(props, scope, void 0);
+    if (import_document_owner.signalDocumentEnabled || scope.block.idState.renderOwner?.signalOwner !== void 0) {
+      const owner = scopeSignalOwner(scope);
+      if (owner !== void 0 && (process.env.NODE_ENV === "production" || hydrateAttributeProbe === null))
+        (0, import_document_owner.streamedSignalOwnerActivator)?.(owner);
+      if (owner === void 0 || (0, import_owner_context.currentSignalOwner)() === owner) {
+        comp(props, scope, void 0);
+      } else (0, import_owner_context.runWithSignalOwner)(owner, () => comp(props, scope, void 0));
+    } else comp(props, scope, void 0);
     if (!scope.mounted) scope.mounted = true;
   } catch (error) {
     profileDidThrow = true;
@@ -18788,7 +18831,7 @@ function componentSlotImpl(outputHandler, parentScope, slotKey, domParent, body,
         void 0,
         outputHandler
       );
-      if (signalInstanceKey !== void 0) SCOPE_SIGNAL_INSTANCE_KEYS.set(b, signalInstanceKey);
+      if (signalInstanceKey !== void 0) stampSignalInstanceKey(b, signalInstanceKey);
       if (typeof __OCTANE_PROFILE_ENABLED__ !== "undefined" && __OCTANE_PROFILE_ENABLED__ && typeof identity === "function")
         profileTrackComponent(b, identity);
       state.block = b;
@@ -18818,7 +18861,7 @@ function componentSlotImpl(outputHandler, parentScope, slotKey, domParent, body,
         void 0,
         outputHandler
       );
-      if (signalInstanceKey !== void 0) SCOPE_SIGNAL_INSTANCE_KEYS.set(b, signalInstanceKey);
+      if (signalInstanceKey !== void 0) stampSignalInstanceKey(b, signalInstanceKey);
       if (typeof __OCTANE_PROFILE_ENABLED__ !== "undefined" && __OCTANE_PROFILE_ENABLED__ && typeof identity === "function")
         profileTrackComponent(b, identity);
       if (state.inherited) b.exclusiveMarkers = true;
@@ -18859,7 +18902,7 @@ function renderOffscreen(parentBlock, domParent, afterNode, body, props, outputH
     env,
     outputHandler
   );
-  if (signalInstanceKey !== void 0) SCOPE_SIGNAL_INSTANCE_KEYS.set(block, signalInstanceKey);
+  if (signalInstanceKey !== void 0) stampSignalInstanceKey(block, signalInstanceKey);
   if (retryLocation !== void 0) SIGNAL_RETRY_LOCATIONS.set(block, retryLocation);
   if (implicitBail) {
     block.$$implicitBail = true;
@@ -21216,7 +21259,7 @@ function childSlot(parentScope, slotKey, domParent, value, anchor, ownEnd, ownsH
         void 0,
         renderReturnedValue
       );
-      if (signalInstanceKey !== void 0) SCOPE_SIGNAL_INSTANCE_KEYS.set(b2, signalInstanceKey);
+      if (signalInstanceKey !== void 0) stampSignalInstanceKey(b2, signalInstanceKey);
       preserveRootCreatedDom(b2);
       if (state.borrowed) b2.exclusiveMarkers = true;
       b2.$$implicitBail = true;
@@ -21312,7 +21355,7 @@ function childSlot(parentScope, slotKey, domParent, value, anchor, ownEnd, ownsH
       void 0,
       renderReturnedValue
     );
-    if (signalInstanceKey !== void 0) SCOPE_SIGNAL_INSTANCE_KEYS.set(b, signalInstanceKey);
+    if (signalInstanceKey !== void 0) stampSignalInstanceKey(b, signalInstanceKey);
     if (typeof __OCTANE_PROFILE_ENABLED__ !== "undefined" && __OCTANE_PROFILE_ENABLED__ && comp !== hostElementBody)
       (0, import_profiling.__profileTrackComponent)(b, !isBodyFn || (0, import_profiling.__profileHasComponentMetadata)(comp) ? comp : null);
     if (state.borrowed) b.exclusiveMarkers = true;
@@ -22461,6 +22504,7 @@ function tryBlock(parentScope, slotKey, domParent, tryBody, catchBody, pendingBo
   const parentBlock = parentScope.block;
   const hydration = activeHydration();
   let state = parentScope.slots[slotKey];
+  let supersedesInputs = false;
   if (state === void 0) {
     let start;
     let end;
@@ -22512,8 +22556,8 @@ function tryBlock(parentScope, slotKey, domParent, tryBody, catchBody, pendingBo
     registerSlot(parentScope, newState);
     state = newState;
   } else {
-    if (state.retrySignalOwners !== void 0 && (state.tryBody !== tryBody || state.env !== env && depsChanged(state.env, env)))
-      clearSignalRetryOwners(state);
+    supersedesInputs = (state.branch === 2 || state.retrySignalOwners !== void 0) && (state.tryBody !== tryBody || state.env !== env && depsChanged(state.env, env));
+    if (state.retrySignalOwners !== void 0 && supersedesInputs) clearSignalRetryOwners(state);
     state.tryBody = tryBody;
     state.catchBody = catchBody;
     state.pendingBody = pendingBody;
@@ -22542,7 +22586,7 @@ function tryBlock(parentScope, slotKey, domParent, tryBody, catchBody, pendingBo
     s.block.extra = s.env;
     renderBlock(s.block);
   } else if (s.branch === 2 && s.tryBlock && !s.tryBlock.disposed && s.hiddenDom) {
-    attemptHiddenReveal(s, void 0, "parent");
+    attemptHiddenReveal(s, void 0, supersedesInputs ? "parent" : "update");
     if (s.branch === 2) refreshPendingBody(s);
   } else if (s.branch === 2) {
     mountTry(s);
@@ -22678,7 +22722,8 @@ function takeInitialSuspenseHydration(state, hydration) {
     state.idState = {
       prefix: state.parentBlock.idState.prefix + "b" + boundaryId + "-",
       next: 0,
-      renderOwner: state.parentBlock.idState.renderOwner
+      renderOwner: state.parentBlock.idState.renderOwner,
+      signalState: state.parentBlock.idState.signalState
     };
     return {
       metadata: [marker],
@@ -22800,7 +22845,7 @@ function renderInitialSuspenseHydration(state, initial) {
     (0, import_read_protocol.setNativeAdoptionResolver)(previousNative);
     WIP_CAPTURE = previousCapture;
     currentHydration = previousHydration;
-    if (previousHydration !== null) previousHydration.node = state.end;
+    if (previousHydration !== null) previousHydration.node = getNextSibling(state.end);
   }
   if (!failed) {
     if (state.retrySignalOwners !== void 0) clearSignalRetryOwners(state);
@@ -22844,7 +22889,7 @@ function renderInitialSuspenseHydration(state, initial) {
       });
   } finally {
     currentHydration = outerHydration;
-    if (outerHydration !== null) outerHydration.node = state.end;
+    if (outerHydration !== null) outerHydration.node = getNextSibling(state.end);
   }
 }
 function mountTry(state) {
@@ -22916,7 +22961,8 @@ function mountTry(state) {
     state.idState = {
       prefix: state.parentBlock.idState.prefix + "b" + streamedBoundaryId + "-",
       next: 0,
-      renderOwner: state.parentBlock.idState.renderOwner
+      renderOwner: state.parentBlock.idState.renderOwner,
+      signalState: state.parentBlock.idState.signalState
     };
   }
   const freshIds = takeNativeFreshArm(hydration, adoptCursor, state.end, state.idState);
@@ -24504,12 +24550,43 @@ function preservesCommittedSuspense(block) {
   }
   return false;
 }
+function markerlessBranchRoots(scope, domParent, after, end = null) {
+  let roots = 0;
+  const slots = scope._slots;
+  if (slots !== null) {
+    for (let i = 0; i < slots.length; i++) {
+      const slot = slots[i];
+      if (slot.anchor === after && (slot.__kind === "ifBlockSlot" || slot.__kind === "switchBlockSlot" || slot.__kind === "componentSlotSlot" && slot.block?.parentNode === domParent)) {
+        roots++;
+        if (end !== null) {
+          journalRootProperty(slot, "anchor", slot.anchor);
+          slot.anchor = end;
+        }
+      }
+    }
+  }
+  const children = scope.children;
+  if (children !== null) {
+    for (let i = 0; i < children.length; i++) {
+      const child2 = children[i].scope;
+      const block = child2.block;
+      if (block !== scope.block && block.parentNode === domParent && block.endMarker === after) {
+        roots += markerlessBranchRoots(child2, domParent, after, end) || 1;
+        if (end !== null) {
+          journalRootProperty(block, "endMarker", block.endMarker);
+          block.endMarker = end;
+        }
+      }
+    }
+  }
+  return roots;
+}
 function finalizeMarkerlessBranch(state, domParent, block, marker, before, after) {
   state.markerlessBefore = void 0;
   if (state.borrowed && state.start === null) return;
   const first = before ? getNextSibling(before) : getFirstChild(domParent);
   const last = after ? (STAGED_DOM?.view(after) ?? after).previousSibling : (STAGED_DOM?.view(domParent) ?? domParent).lastChild;
-  if (last !== null && first === last && first.nodeType === 1) {
+  if (last !== null && first === last && first.nodeType === 1 && markerlessBranchRoots(block, domParent, after) <= 1) {
     block.startMarker = first;
     block.endMarker = first;
     state.end = first;
@@ -24523,6 +24600,7 @@ function finalizeMarkerlessBranch(state, domParent, block, marker, before, after
     block.exclusiveMarkers = true;
     state.start = start;
     state.end = end;
+    markerlessBranchRoots(block, domParent, after, end);
   }
 }
 function replaceSharedBlockBoundary(parent, oldStart, oldEnd, newStart, newEnd) {
@@ -28084,8 +28162,43 @@ function hydrateRootWithOutputHandler(container, bodyOrElement, propsOrOptions,
 }
 function createIndependentHydrateActivator(body) {
   return (context) => {
+    const { captures, element, manifest, signalOwner } = context;
+    let intents = context.intents.length === 0 ? null : context.intents;
+    const notify = intents === null ? null : (scope) => {
+      if (intents === null || scope.block.disposed) return;
+      const retryBatch = suspenseRetryBatchForSubtree(scope.block);
+      if (retryBatch !== null) {
+        const effect = scope.effectSlots.find((entry) => entry.connectedFn === notify);
+        (retryBatch.afterCommit ??= []).push(() => {
+          if (intents === null || scope.block.disposed || !effect.active) return;
+          effectQueues[PASSIVE].push({
+            scope,
+            slot: effect.slot,
+            fn: effect.connectedFn,
+            order: effect.order,
+            revision: effect.revision,
+            args: effect.connectedArgs,
+            phase: PASSIVE,
+            seq: commitSeq++
+          });
+          if (!passiveScheduled) schedulePassiveFlush();
+        });
+        return;
+      }
+      const replays = intents;
+      intents = null;
+      for (const replay of replays) {
+        if (!(0, import_event_capture.isHydrationSelectionIntentCurrent)(replay)) continue;
+        const originalTarget = replay.event.target;
+        if (originalTarget === null || originalTarget.nodeType !== 1 || !element.contains(originalTarget))
+          continue;
+        const target = originalTarget;
+        target.dispatchEvent(cloneHydrationReplayEvent(replay.event, target));
+      }
+    };
     const content = (_props, scope, extra) => {
-      body(context.captures, scope, extra);
+      body(captures, scope, extra);
+      if (notify !== null) useEffect(notify, [scope], HYDRATE_NOTIFY_SLOT);
     };
     const framed = (_props, scope) => {
       tryBlock(scope, 0, scope.block.parentNode, content, null, null, scope.block.endMarker);
@@ -28093,19 +28206,18 @@ function createIndependentHydrateActivator(body) {
     const adapter = (_props, scope) => {
       componentSlotVoid(scope, 0, scope.block.parentNode, framed, void 0, scope.block.endMarker);
     };
-    const root = hydrateRoot(context.element, adapter, context.captures, {
-      identifierPrefix: context.manifest.boundaryId + "-",
-      identifierSeed: context.manifest.idSeed,
-      signalInstancePrefix: context.manifest.boundaryId,
-      ...context.signalOwner === void 0 ? {} : { signalOwner: context.signalOwner }
+    const root = hydrateRoot(element, adapter, captures, {
+      identifierPrefix: manifest.boundaryId + "-",
+      identifierSeed: manifest.idSeed,
+      signalInstancePrefix: manifest.boundaryId,
+      ...signalOwner === void 0 ? {} : { signalOwner }
     });
-    for (const replay of context.intents) {
-      if (!(0, import_event_capture.isHydrationSelectionIntentCurrent)(replay)) continue;
-      const originalTarget = replay.event.target;
-      if (originalTarget === null || originalTarget.nodeType !== 1 || !context.element.contains(originalTarget))
-        continue;
-      const target = originalTarget;
-      target.dispatchEvent(cloneHydrationReplayEvent(replay.event, target));
+    if (notify !== null) {
+      const unmount = root.unmount;
+      root.unmount = () => {
+        intents = null;
+        unmount();
+      };
     }
     return root;
   };

package/dist/cjs/server/index.cjs

@@ -42,6 +42,7 @@ __export(server_exports, {
   createContext: () => import_runtime_server.createContext,
   createElement: () => import_runtime_server.createElement,
   createPortal: () => import_runtime_server.createPortal,
+  createResizeObserver: () => import_resize_observer.createResizeObserver,
   createScopedElement: () => import_runtime_server.createScopedElement,
   createScopedValue: () => import_runtime_server.createScopedValue,
   createStreamedRegionPlacementFrame: () => import_streamed_region.createStreamedRegionPlacementFrame,
@@ -180,6 +181,7 @@ __export(server_exports, {
 });
 module.exports = __toCommonJS(server_exports);
 var import_trusted_html = require("../trusted-html.cjs");
+var import_resize_observer = require("../resize-observer.cjs");
 var import_rpc = require("./rpc.cjs");
 var import_early_signals = require("./early-signals.cjs");
 var import_rpc_batch = require("./rpc-batch.cjs");
@@ -218,6 +220,7 @@ var import_runtime_server = require("../runtime.server.cjs");
   createContext,
   createElement,
   createPortal,
+  createResizeObserver,
   createScopedElement,
   createScopedValue,
   createStreamedRegionPlacementFrame,

package/dist/cjs/signals/graph.cjs

@@ -537,6 +537,7 @@ function evaluate(node) {
     node.flags = ReactiveFlags.Mutable | ReactiveFlags.Watching;
     return true;
   }
+  if (historicalReader || (0, import_read_protocol.getNativeAdoptionResolver)()) return evaluateLiveNode(node);
   const previousNode = activeNode;
   const previousOwners = activeOwners;
   const previousObserver = (0, import_read_protocol.setNativeReadObserver)(null);
@@ -579,6 +580,16 @@ function evaluate(node) {
   commitState(node, next);
   return true;
 }
+function evaluateLiveNode(node) {
+  const previousReader = setHistoricalReader(void 0);
+  const previousAdoption = (0, import_read_protocol.setNativeAdoptionResolver)(null);
+  try {
+    return evaluate(node);
+  } finally {
+    (0, import_read_protocol.setNativeAdoptionResolver)(previousAdoption);
+    setHistoricalReader(previousReader);
+  }
+}
 function commitState(node, next) {
   const previous = node.state;
   node.state = next;

package/dist/cjs/version.cjs

@@ -21,7 +21,7 @@ __export(version_exports, {
   version: () => version
 });
 module.exports = __toCommonJS(version_exports);
-const version = "0.3.6";
+const version = "0.4.1";
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   version