Skip to content

Commit

Permalink
bump re-frame and remove 16ms delay for reagent tick
Browse files Browse the repository at this point in the history
Signed-off-by: Andrey Shovkoplyas <motor4ik@gmail.com>
  • Loading branch information
flexsurfer committed Apr 22, 2020
1 parent 74f1405 commit da038aa
Show file tree
Hide file tree
Showing 8 changed files with 157 additions and 101 deletions.
4 changes: 1 addition & 3 deletions deps.edn
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,7 @@
org.clojure/core.async {:mvn/version "0.4.474"}
reagent {:mvn/version "0.7.0"
:exclusions [cljsjs/react cljsjs/react-dom cljsjs/react-dom-server cljsjs/create-react-class]}
re-frame {:git/url "https://github.com/status-im/re-frame"
:sha "b0d3b0f016f217c6a397a54e5eba9486471fb172"
:deps/manifest :deps}
re-frame {:mvn/version "0.12.0"}
com.andrewmcveigh/cljs-time {:mvn/version "0.5.2"}
binaryage/oops {:mvn/version "0.7.0"}
status-im/timbre {:mvn/version "4.10.0-2-status"}
Expand Down
7 changes: 6 additions & 1 deletion env/dev/env/android/main.cljs
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,12 @@
[re-frisk-remote.core :as rr]
[env.config :as conf]
[env.utils]
[status-im.utils.handlers :as utils.handlers]))
[status-im.utils.handlers :as utils.handlers]
[re-frame.interop :as interop]
[reagent.impl.batching :as batching]))

(set! interop/next-tick js/setTimeout)
(set! batching/fake-raf #(js/setTimeout % 0))

(enable-console-print!)

Expand Down
7 changes: 6 additions & 1 deletion env/dev/env/ios/main.cljs
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,12 @@
[status-im.utils.handlers :as utils.handlers]
[figwheel.client :as figwheel]
[env.config :as conf]
[env.utils]))
[env.utils]
[re-frame.interop :as interop]
[reagent.impl.batching :as batching]))

(set! interop/next-tick js/setTimeout)
(set! batching/fake-raf #(js/setTimeout % 0))

(enable-console-print!)

Expand Down
11 changes: 8 additions & 3 deletions env/prod/env/android/main.cljs
Original file line number Diff line number Diff line change
@@ -1,6 +1,11 @@
(ns env.android.main
(:require [status-im.android.core :as core]))
(ns env.android.main
(:require [status-im.android.core :as core]
[re-frame.interop :as interop]
[reagent.impl.batching :as batching]))

(core/init)
(set! interop/next-tick js/setTimeout)
(set! batching/fake-raf #(js/setTimeout % 0))

(core/init)


11 changes: 7 additions & 4 deletions env/prod/env/ios/main.cljs
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
(ns env.ios.main
(:require [status-im.ios.core :as core]))

(core/init)
(ns env.ios.main
(:require [status-im.ios.core :as core]
[re-frame.interop :as interop]
[reagent.impl.batching :as batching]))

(set! interop/next-tick js/setTimeout)
(set! batching/fake-raf #(js/setTimeout % 0))

(core/init)
14 changes: 8 additions & 6 deletions nix/lein/lein-project-deps-maven-inputs.txt
Original file line number Diff line number Diff line change
Expand Up @@ -13,12 +13,15 @@ https://repo.clojars.org/cljsjs/highlight/9.6.0-0/highlight-9.6.0-0
https://repo.clojars.org/cljsjs/prop-types/15.6.0-0/prop-types-15.6.0-0
https://repo.clojars.org/cljsjs/react-dom-server/15.2.1-0/react-dom-server-15.2.1-0
https://repo.clojars.org/cljsjs/react-dom-server/15.5.4-0/react-dom-server-15.5.4-0
https://repo.clojars.org/cljsjs/react-dom-server/16.13.0-0/react-dom-server-16.13.0-0
https://repo.clojars.org/cljsjs/react-dom/15.2.1-0/react-dom-15.2.1-0
https://repo.clojars.org/cljsjs/react-dom/15.5.4-0/react-dom-15.5.4-0
https://repo.clojars.org/cljsjs/react-dom/16.13.0-0/react-dom-16.13.0-0
https://repo.clojars.org/cljsjs/react-flip-move/2.9.17-0/react-flip-move-2.9.17-0
https://repo.clojars.org/cljsjs/react-highlight/1.0.7-1/react-highlight-1.0.7-1
https://repo.clojars.org/cljsjs/react/15.2.1-0/react-15.2.1-0
https://repo.clojars.org/cljsjs/react/15.5.4-0/react-15.5.4-0
https://repo.clojars.org/cljsjs/react/16.13.0-0/react-16.13.0-0
https://repo.clojars.org/clout/clout/2.1.2/clout-2.1.2
https://repo.clojars.org/com/andrewmcveigh/cljs-time/0.4.0/cljs-time-0.4.0
https://repo.clojars.org/com/andrewmcveigh/cljs-time/0.5.2/cljs-time-0.5.2
Expand Down Expand Up @@ -49,13 +52,16 @@ https://repo.clojars.org/medley/medley/0.8.2/medley-0.8.2
https://repo.clojars.org/meta-merge/meta-merge/1.0.0/meta-merge-1.0.0
https://repo.clojars.org/mvxcvi/alphabase/1.0.0/alphabase-1.0.0
https://repo.clojars.org/net/cgrand/macrovich/0.2.0/macrovich-0.2.0
https://repo.clojars.org/net/cgrand/macrovich/0.2.1/macrovich-0.2.1
https://repo.clojars.org/quoin/quoin/0.1.2/quoin-0.1.2
https://repo.clojars.org/rasom/lein-githooks/0.1.5/lein-githooks-0.1.5
https://repo.clojars.org/re-com/re-com/2.1.0/re-com-2.1.0
https://repo.clojars.org/re-frame/re-frame/0.10.1/re-frame-0.10.1
https://repo.clojars.org/re-frame/re-frame/0.12.0/re-frame-0.12.0
https://repo.clojars.org/re-frisk-shell/re-frisk-shell/0.5.2/re-frisk-shell-0.5.2
https://repo.clojars.org/re-frisk-sidecar/re-frisk-sidecar/0.5.7/re-frisk-sidecar-0.5.7
https://repo.clojars.org/re-frisk/re-frisk/0.5.4/re-frisk-0.5.4
https://repo.clojars.org/reagent/reagent/0.10.0/reagent-0.10.0
https://repo.clojars.org/reagent/reagent/0.6.0/reagent-0.6.0
https://repo.clojars.org/reagent/reagent/0.7.0/reagent-0.7.0
https://repo.clojars.org/rewrite-clj/rewrite-clj/0.5.2/rewrite-clj-0.5.2
Expand All @@ -73,7 +79,6 @@ https://repo.clojars.org/ring/ring-core/1.5.1/ring-core-1.5.1
https://repo.clojars.org/ring/ring-defaults/0.1.5/ring-defaults-0.1.5
https://repo.clojars.org/ring/ring-headers/0.1.3/ring-headers-0.1.3
https://repo.clojars.org/ring/ring-ssl/0.2.1/ring-ssl-0.2.1
https://repo.clojars.org/status-im/re-frame/0.10.5/re-frame-0.10.5
https://repo.clojars.org/status-im/timbre/4.10.0-2-status/timbre-4.10.0-2-status
https://repo.clojars.org/viebel/codox-klipse-theme/0.0.1/codox-klipse-theme-0.0.1
https://repo.clojars.org/zprint/zprint/0.4.7/zprint-0.4.7
Expand Down Expand Up @@ -122,14 +127,12 @@ https://repo1.maven.org/maven2/com/google/javascript/closure-compiler-externs/v2
https://repo1.maven.org/maven2/com/google/javascript/closure-compiler-externs/v20160911/closure-compiler-externs-v20160911
https://repo1.maven.org/maven2/com/google/javascript/closure-compiler-externs/v20161201/closure-compiler-externs-v20161201
https://repo1.maven.org/maven2/com/google/javascript/closure-compiler-externs/v20170521/closure-compiler-externs-v20170521
https://repo1.maven.org/maven2/com/google/javascript/closure-compiler-externs/v20170806/closure-compiler-externs-v20170806
https://repo1.maven.org/maven2/com/google/javascript/closure-compiler-externs/v20170910/closure-compiler-externs-v20170910
https://repo1.maven.org/maven2/com/google/javascript/closure-compiler-externs/v20190325/closure-compiler-externs-v20190325
https://repo1.maven.org/maven2/com/google/javascript/closure-compiler-main/v20160315/closure-compiler-main-v20160315
https://repo1.maven.org/maven2/com/google/javascript/closure-compiler-main/v20160911/closure-compiler-main-v20160911
https://repo1.maven.org/maven2/com/google/javascript/closure-compiler-main/v20161201/closure-compiler-main-v20161201
https://repo1.maven.org/maven2/com/google/javascript/closure-compiler-main/v20170521/closure-compiler-main-v20170521
https://repo1.maven.org/maven2/com/google/javascript/closure-compiler-main/v20170806/closure-compiler-main-v20170806
https://repo1.maven.org/maven2/com/google/javascript/closure-compiler-main/v20170910/closure-compiler-main-v20170910
https://repo1.maven.org/maven2/com/google/javascript/closure-compiler-main/v20190325/closure-compiler-main-v20190325
https://repo1.maven.org/maven2/com/google/javascript/closure-compiler-parent/v20150126/closure-compiler-parent-v20150126
Expand All @@ -138,14 +141,12 @@ https://repo1.maven.org/maven2/com/google/javascript/closure-compiler-parent/v20
https://repo1.maven.org/maven2/com/google/javascript/closure-compiler-parent/v20160911/closure-compiler-parent-v20160911
https://repo1.maven.org/maven2/com/google/javascript/closure-compiler-parent/v20161201/closure-compiler-parent-v20161201
https://repo1.maven.org/maven2/com/google/javascript/closure-compiler-parent/v20170521/closure-compiler-parent-v20170521
https://repo1.maven.org/maven2/com/google/javascript/closure-compiler-parent/v20170806/closure-compiler-parent-v20170806
https://repo1.maven.org/maven2/com/google/javascript/closure-compiler-parent/v20170910/closure-compiler-parent-v20170910
https://repo1.maven.org/maven2/com/google/javascript/closure-compiler-parent/v20190325/closure-compiler-parent-v20190325
https://repo1.maven.org/maven2/com/google/javascript/closure-compiler-unshaded/v20160315/closure-compiler-unshaded-v20160315
https://repo1.maven.org/maven2/com/google/javascript/closure-compiler-unshaded/v20160911/closure-compiler-unshaded-v20160911
https://repo1.maven.org/maven2/com/google/javascript/closure-compiler-unshaded/v20161201/closure-compiler-unshaded-v20161201
https://repo1.maven.org/maven2/com/google/javascript/closure-compiler-unshaded/v20170521/closure-compiler-unshaded-v20170521
https://repo1.maven.org/maven2/com/google/javascript/closure-compiler-unshaded/v20170806/closure-compiler-unshaded-v20170806
https://repo1.maven.org/maven2/com/google/javascript/closure-compiler-unshaded/v20170910/closure-compiler-unshaded-v20170910
https://repo1.maven.org/maven2/com/google/javascript/closure-compiler-unshaded/v20190325/closure-compiler-unshaded-v20190325
https://repo1.maven.org/maven2/com/google/javascript/closure-compiler/v20150126/closure-compiler-v20150126
Expand Down Expand Up @@ -187,6 +188,7 @@ https://repo1.maven.org/maven2/org/apache/commons/commons-parent/35/commons-pare
https://repo1.maven.org/maven2/org/apache/commons/commons-parent/39/commons-parent-39
https://repo1.maven.org/maven2/org/checkerframework/checker-qual/2.0.0/checker-qual-2.0.0
https://repo1.maven.org/maven2/org/clojure/clojure/1.10.0/clojure-1.10.0
https://repo1.maven.org/maven2/org/clojure/clojure/1.10.1/clojure-1.10.1
https://repo1.maven.org/maven2/org/clojure/clojure/1.2.1/clojure-1.2.1
https://repo1.maven.org/maven2/org/clojure/clojure/1.3.0/clojure-1.3.0
https://repo1.maven.org/maven2/org/clojure/clojure/1.4.0/clojure-1.4.0
Expand All @@ -207,7 +209,6 @@ https://repo1.maven.org/maven2/org/clojure/clojurescript/1.9.293/clojurescript-1
https://repo1.maven.org/maven2/org/clojure/clojurescript/1.9.456/clojurescript-1.9.456
https://repo1.maven.org/maven2/org/clojure/clojurescript/1.9.655/clojurescript-1.9.655
https://repo1.maven.org/maven2/org/clojure/clojurescript/1.9.671/clojurescript-1.9.671
https://repo1.maven.org/maven2/org/clojure/clojurescript/1.9.908/clojurescript-1.9.908
https://repo1.maven.org/maven2/org/clojure/clojurescript/1.9.946/clojurescript-1.9.946
https://repo1.maven.org/maven2/org/clojure/core.async/0.2.395/core.async-0.2.395
https://repo1.maven.org/maven2/org/clojure/core.async/0.4.474/core.async-0.4.474
Expand Down Expand Up @@ -238,6 +239,7 @@ https://repo1.maven.org/maven2/org/clojure/tools.analyzer.jvm/0.6.10/tools.analy
https://repo1.maven.org/maven2/org/clojure/tools.analyzer.jvm/0.7.0/tools.analyzer.jvm-0.7.0
https://repo1.maven.org/maven2/org/clojure/tools.analyzer/0.6.9/tools.analyzer-0.6.9
https://repo1.maven.org/maven2/org/clojure/tools.logging/0.3.1/tools.logging-0.3.1
https://repo1.maven.org/maven2/org/clojure/tools.logging/0.4.1/tools.logging-0.4.1
https://repo1.maven.org/maven2/org/clojure/tools.macro/0.1.5/tools.macro-0.1.5
https://repo1.maven.org/maven2/org/clojure/tools.namespace/0.2.11/tools.namespace-0.2.11
https://repo1.maven.org/maven2/org/clojure/tools.reader/0.10.0/tools.reader-0.10.0
Expand Down
Loading

0 comments on commit da038aa

Please sign in to comment.