From d19a51debf1d875c4b950be28f03fb83223710da Mon Sep 17 00:00:00 2001 From: Kimo Knowles Date: Thu, 7 Dec 2023 20:45:35 +0100 Subject: [PATCH] Revert "Dispatch an init event in the client to fix 10x trace state (opt-in)" This reverts commit 071448858cc9a4e22ac2a1adf8e2e1b48d2ec775. A workaround that didn't work very well. Making progress on a real solution. See #263 --- README.md | 1 - examples/todomvc/shadow-cljs.edn | 3 +-- src/day8/re_frame_10x.cljs | 4 +--- src/day8/re_frame_10x/preload/react_17.cljs | 4 ---- src/day8/re_frame_10x/preload/react_18.cljs | 4 ---- 5 files changed, 2 insertions(+), 14 deletions(-) diff --git a/README.md b/README.md index d4770e08..8f7094f9 100644 --- a/README.md +++ b/README.md @@ -279,7 +279,6 @@ name | description | type | example ...`time-travel?` | selecting an event reverts your app-db | boolean | `true` ...`ignored-libs` | ignore low-level trace | seq of keywords | `"[:reagent :re-frame]"` ...`ns-aliases` | display aliased keywords in data inspectors | map of symbol->symbol | `"{long-namespace ln}"` -...`init-event?` | lets 10x dispatch its own init event in your client re-frame (this fixes some [quirks](https://github.com/day8/re-frame-10x/issues/263)) | boolean | `false` diff --git a/examples/todomvc/shadow-cljs.edn b/examples/todomvc/shadow-cljs.edn index c5ff6d99..225d522b 100644 --- a/examples/todomvc/shadow-cljs.edn +++ b/examples/todomvc/shadow-cljs.edn @@ -16,8 +16,7 @@ :closure-defines {re-frame.trace.trace-enabled? true day8.re-frame-10x.debug? true - day8.re-frame.tracing.trace-enabled? true - day8.re-frame-10x.init-event? true} + day8.re-frame.tracing.trace-enabled? true} :external-config {:devtools/config {:features-to-install diff --git a/src/day8/re_frame_10x.cljs b/src/day8/re_frame_10x.cljs index 00704341..d659ef56 100644 --- a/src/day8/re_frame_10x.cljs +++ b/src/day8/re_frame_10x.cljs @@ -151,7 +151,6 @@ (goog-define time-travel? true) (goog-define ignored-libs "[:reagent :re-frame]") (goog-define ns-aliases "{long-namespace ln}") -(goog-define init-event? false) (def project-config (let [read reader.edn/read-string-maybe @@ -164,6 +163,5 @@ :filtered-view-trace (some->> hidden-namespaces read (map view) sortable-uuid-map) :app-db-follows-events? time-travel? :low-level-trace (some-> ignored-libs read (pred-map #{:re-frame :reagent})) - :ns-aliases (some->> ns-aliases read (map alias) sortable-uuid-map) - :init-event? init-event?} + :ns-aliases (some->> ns-aliases read (map alias) sortable-uuid-map)} (into {} keep-vals)))) diff --git a/src/day8/re_frame_10x/preload/react_17.cljs b/src/day8/re_frame_10x/preload/react_17.cljs index 2fd727e0..77e1b815 100644 --- a/src/day8/re_frame_10x/preload/react_17.cljs +++ b/src/day8/re_frame_10x/preload/react_17.cljs @@ -23,10 +23,6 @@ (rf/dispatch-sync [::events/init re-frame-10x/project-config]) -(when re-frame-10x/init-event? - (re-frame.core/reg-event-db :day8.re-frame-10x/init (fn [db _] db)) - (re-frame.fx/dispatch-later {:ms 500 :dispatch [:day8.re-frame-10x/init]})) - (rf/clear-subscription-cache!) (def shadow-root (re-frame-10x/create-shadow-root)) diff --git a/src/day8/re_frame_10x/preload/react_18.cljs b/src/day8/re_frame_10x/preload/react_18.cljs index 3ba4b7f4..3ad22dee 100644 --- a/src/day8/re_frame_10x/preload/react_18.cljs +++ b/src/day8/re_frame_10x/preload/react_18.cljs @@ -17,10 +17,6 @@ (rf/dispatch-sync [::events/init re-frame-10x/project-config]) -(when re-frame-10x/init-event? - (re-frame.core/reg-event-db :day8.re-frame-10x/init (fn [db _] db)) - (re-frame.fx/dispatch-later {:ms 500 :dispatch [:day8.re-frame-10x/init]})) - (rf/clear-subscription-cache!) (def shadow-root (re-frame-10x/create-shadow-root))