Skip to content

Commit d001d76

Browse files
committed
Fix interop issues
Re-frame.utils was failing to import in a clj repl, since clj doesn't support #queue []. Fixed that, as well as some other potential compatibility problems.
1 parent 1d81f23 commit d001d76

File tree

5 files changed

+13
-5
lines changed

5 files changed

+13
-5
lines changed

docs/releases/2023.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,12 @@
66

77
> The re-frame [Clojars page](https://clojars.org/re-frame/) contains dependency coordinates for Maven/deps/Lein.
88
9+
## 1.4.2 (2023-12-09)
10+
11+
#### Fixed
12+
13+
- `re-frame.utils` failed to load in a clj runtime, due to interop issues.
14+
915
## 1.4.1 (2023-12-07)
1016

1117
#### Added

src/re_frame/flow/alpha.cljc

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
[re-frame.registrar :refer [get-handler]]
66
[re-frame.loggers :refer [console]]
77
[re-frame.interceptor :refer [->interceptor get-effect get-coeffect update-effect assoc-effect]]
8+
[re-frame.interop :as interop]
89
[reagent.core :as r]))
910

1011
(def db-path? vector?)
@@ -13,7 +14,7 @@
1314

1415
(def flow<-? (comp some? ::flow<-))
1516

16-
(def flows (r/atom {}))
17+
(def flows (interop/ratom {}))
1718

1819
(defn lookup [id] (get @flows id))
1920

src/re_frame/subs/alpha.cljc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
[re-frame.subs :refer [deref-input-signals sugar warn-when-not-reactive]]
55
[re-frame.registrar :refer [register-handler]]
66
[re-frame.register.alpha :refer [reg lifecycle->method]]
7-
[re-frame.interop :refer [add-on-dispose! make-reaction reactive? reagent-id]]
7+
[re-frame.interop :refer [add-on-dispose! make-reaction reactive? reagent-id ratom]]
88
[re-frame.query.alpha :as q]
99
[re-frame :as-alias rf]
1010
[re-frame.trace :as trace :include-macros true]
@@ -102,7 +102,7 @@
102102

103103
(reg :sub-lifecycle :forever sub-forever)
104104

105-
(def nil-ref (r/atom nil))
105+
(def nil-ref (ratom nil))
106106

107107
(defn sub-flow [q]
108108
(or (some-> (:id (or (second (::rf/query-v q)) q))

src/re_frame/utils.cljc

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
(ns re-frame.utils
22
(:require
3-
[re-frame.loggers :refer [console]]))
3+
[re-frame.loggers :refer [console]]
4+
[re-frame.interop :as interop]))
45

56
(defn dissoc-in
67
"Dissociates an entry from a nested associative structure returning a new
@@ -53,7 +54,7 @@
5354
{} graph)
5455
ks (keys graph)]
5556
(loop [q (filter #(zero? (get in-degree % 0)) ks)
56-
sorted #queue []
57+
sorted interop/empty-queue
5758
in-degree in-degree]
5859
(cond
5960
(seq q)
File renamed without changes.

0 commit comments

Comments
 (0)