coop/rose-ash
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "hydrate-island: clear-and-replace instead of hydration walk"

Browse Source 
This reverts commit ca077b429b.
This commit is contained in:
giles
2026-04-16 13:44:54 +00:00
parent ca077b429b
commit faa65e15d8
2 changed files with 6 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
shared/static/wasm/sx/boot.sx
View File

@@ -332,25 +332,20 @@
(component-params comp)) (component-params comp))
(let (let
((cursor (dict "parent" el "index" 0))) ((cursor (dict "parent" el "index" 0)))
(host-call el "replaceChildren") (scope-push! "sx-hydrating" cursor)
(scope-push! "sx-hydrating" nil)
(cek-try (cek-try
(fn (fn
() ()
(with-island-scope (with-island-scope
(fn (disposable) (append! disposers disposable)) (fn (disposable) (append! disposers disposable))
(fn (fn () (render-to-dom (component-body comp) local nil))))
()
(let
((result (render-to-dom (component-body comp) local el)))
(when result (dom-append el result))))))
(fn (fn
(err) (err)
(scope-pop! "sx-hydrating") (scope-pop! "sx-hydrating")
(log-warn (log-warn
(str "hydrate fallback: " comp-name " — " err)) (str "hydrate fallback: " comp-name " — " err))
(let (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) (host-call el "replaceChildren" fallback)
nil))) nil)))
(scope-pop! "sx-hydrating") (scope-pop! "sx-hydrating")

11
web/boot.sx
View File

@@ -332,25 +332,20 @@
(component-params comp)) (component-params comp))
(let (let
((cursor (dict "parent" el "index" 0))) ((cursor (dict "parent" el "index" 0)))
(host-call el "replaceChildren") (scope-push! "sx-hydrating" cursor)
(scope-push! "sx-hydrating" nil)
(cek-try (cek-try
(fn (fn
() ()
(with-island-scope (with-island-scope
(fn (disposable) (append! disposers disposable)) (fn (disposable) (append! disposers disposable))
(fn (fn () (render-to-dom (component-body comp) local nil))))
()
(let
((result (render-to-dom (component-body comp) local el)))
(when result (dom-append el result))))))
(fn (fn
(err) (err)
(scope-pop! "sx-hydrating") (scope-pop! "sx-hydrating")
(log-warn (log-warn
(str "hydrate fallback: " comp-name " — " err)) (str "hydrate fallback: " comp-name " — " err))
(let (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) (host-call el "replaceChildren" fallback)
nil))) nil)))
(scope-pop! "sx-hydrating") (scope-pop! "sx-hydrating")