From faa65e15d800a5ac27fd2ee766297f8a50c1774c Mon Sep 17 00:00:00 2001
From: giles <giles.bradshaw@rose-ash.com>
Date: Thu, 16 Apr 2026 13:44:54 +0000
Subject: [PATCH] Revert "hydrate-island: clear-and-replace instead of
 hydration walk"

This reverts commit ca077b429bf0f36a4ef04603a9baf23e05d7359d.
---
 shared/static/wasm/sx/boot.sx | 11 +++--------
 web/boot.sx                   | 11 +++--------
 2 files changed, 6 insertions(+), 16 deletions(-)

diff --git a/shared/static/wasm/sx/boot.sx b/shared/static/wasm/sx/boot.sx
index 6cb0f604..a5b319d1 100644
--- a/shared/static/wasm/sx/boot.sx
+++ b/shared/static/wasm/sx/boot.sx
@@ -332,25 +332,20 @@
                 (component-params comp))
               (let
                 ((cursor (dict "parent" el "index" 0)))
-                (host-call el "replaceChildren")
-                (scope-push! "sx-hydrating" nil)
+                (scope-push! "sx-hydrating" cursor)
                 (cek-try
                   (fn
                     ()
                     (with-island-scope
                       (fn (disposable) (append! disposers disposable))
-                      (fn
-                        ()
-                        (let
-                          ((result (render-to-dom (component-body comp) local el)))
-                          (when result (dom-append el result))))))
+                      (fn () (render-to-dom (component-body comp) local nil))))
                   (fn
                     (err)
                     (scope-pop! "sx-hydrating")
                     (log-warn
                       (str "hydrate fallback: " comp-name " — " err))
                     (let
-                      ((fallback (dom-create-text (str "Island error: " comp-name " " err))))
+                      ((fallback (cek-try (fn () (with-island-scope (fn (d) (append! disposers d)) (fn () (render-to-dom (component-body comp) local nil)))) (fn (err2) (let ((e (dom-create-element "div" nil))) (dom-set-text-content e (str "Island error: " comp-name "\n" err2)) e)))))
                       (host-call el "replaceChildren" fallback)
                       nil)))
                 (scope-pop! "sx-hydrating")
diff --git a/web/boot.sx b/web/boot.sx
index 6cb0f604..a5b319d1 100644
--- a/web/boot.sx
+++ b/web/boot.sx
@@ -332,25 +332,20 @@
                 (component-params comp))
               (let
                 ((cursor (dict "parent" el "index" 0)))
-                (host-call el "replaceChildren")
-                (scope-push! "sx-hydrating" nil)
+                (scope-push! "sx-hydrating" cursor)
                 (cek-try
                   (fn
                     ()
                     (with-island-scope
                       (fn (disposable) (append! disposers disposable))
-                      (fn
-                        ()
-                        (let
-                          ((result (render-to-dom (component-body comp) local el)))
-                          (when result (dom-append el result))))))
+                      (fn () (render-to-dom (component-body comp) local nil))))
                   (fn
                     (err)
                     (scope-pop! "sx-hydrating")
                     (log-warn
                       (str "hydrate fallback: " comp-name " — " err))
                     (let
-                      ((fallback (dom-create-text (str "Island error: " comp-name " " err))))
+                      ((fallback (cek-try (fn () (with-island-scope (fn (d) (append! disposers d)) (fn () (render-to-dom (component-body comp) local nil)))) (fn (err2) (let ((e (dom-create-element "div" nil))) (dom-set-text-content e (str "Island error: " comp-name "\n" err2)) e)))))
                       (host-call el "replaceChildren" fallback)
                       nil)))
                 (scope-pop! "sx-hydrating")