updating cljs compiler
Signed-off-by: yenda <eric@status.im>
This commit is contained in:
parent
9f350765e9
commit
b41df3b3c2
8
deps.edn
8
deps.edn
|
@ -1,6 +1,6 @@
|
||||||
{:paths ["components/src" "src" "react-native/src/cljsjs" "resources"]
|
{:paths ["components/src" "src" "react-native/src/cljsjs" "resources"]
|
||||||
:deps {org.clojure/clojure {:mvn/version "1.9.0"}
|
:deps {org.clojure/clojure {:mvn/version "1.9.0"}
|
||||||
org.clojure/clojurescript {:mvn/version "1.10.238"}
|
org.clojure/clojurescript {:mvn/version "1.10.439"}
|
||||||
org.clojure/core.async {:mvn/version "0.4.474"}
|
org.clojure/core.async {:mvn/version "0.4.474"}
|
||||||
reagent {:mvn/version "0.7.0"
|
reagent {:mvn/version "0.7.0"
|
||||||
:exclusions [cljsjs/react cljsjs/react-dom cljsjs/react-dom-server cljsjs/create-react-class]}
|
:exclusions [cljsjs/react cljsjs/react-dom cljsjs/react-dom-server cljsjs/create-react-class]}
|
||||||
|
@ -12,8 +12,7 @@
|
||||||
hickory {:mvn/version "0.7.1"}
|
hickory {:mvn/version "0.7.1"}
|
||||||
com.cognitect/transit-cljs {:mvn/version "0.8.248"}
|
com.cognitect/transit-cljs {:mvn/version "0.8.248"}
|
||||||
status-im/pluto {:mvn/version "iteration-4-1"}
|
status-im/pluto {:mvn/version "iteration-4-1"}
|
||||||
mvxcvi/alphabase {:mvn/version "1.0.0"}
|
mvxcvi/alphabase {:mvn/version "1.0.0"}}
|
||||||
rasom/cljs-react-navigation {:mvn/version "0.1.4"}}
|
|
||||||
|
|
||||||
:aliases
|
:aliases
|
||||||
{:dev {:extra-deps
|
{:dev {:extra-deps
|
||||||
|
@ -23,8 +22,7 @@
|
||||||
;; Figwheel ClojureScript REPL
|
;; Figwheel ClojureScript REPL
|
||||||
cider/piggieback {:mvn/version "0.3.9"
|
cider/piggieback {:mvn/version "0.3.9"
|
||||||
:exclusions [com.google.javascript/closure-compiler]}
|
:exclusions [com.google.javascript/closure-compiler]}
|
||||||
figwheel-sidecar {:mvn/version "0.5.16"
|
figwheel-sidecar {:mvn/version "0.5.18-SNAPSHOT"}
|
||||||
:exclusions [com.google.javascript/closure-compiler]}
|
|
||||||
re-frisk-remote {:mvn/version "0.5.5"}
|
re-frisk-remote {:mvn/version "0.5.5"}
|
||||||
re-frisk-sidecar {:mvn/version "0.5.7"}
|
re-frisk-sidecar {:mvn/version "0.5.7"}
|
||||||
hawk {:mvn/version "0.2.11"}
|
hawk {:mvn/version "0.2.11"}
|
||||||
|
|
|
@ -34,8 +34,8 @@
|
||||||
["do" "clean"
|
["do" "clean"
|
||||||
["with-profile" "prod" "cljsbuild" "once" "ios"]]
|
["with-profile" "prod" "cljsbuild" "once" "ios"]]
|
||||||
"prod-build-desktop" ^{:doc "Recompile code for desktop with prod profile."}
|
"prod-build-desktop" ^{:doc "Recompile code for desktop with prod profile."}
|
||||||
["do" "clean"
|
["do" "clean"
|
||||||
["with-profile" "prod" "cljsbuild" "once" "desktop"]]
|
["with-profile" "prod" "cljsbuild" "once" "desktop"]]
|
||||||
"figwheel-repl" ["with-profile" "+figwheel" "run" "-m" "clojure.main" "env/dev/run.clj"]
|
"figwheel-repl" ["with-profile" "+figwheel" "run" "-m" "clojure.main" "env/dev/run.clj"]
|
||||||
"test-cljs" ["with-profile" "test" "doo" "node" "test" "once"]
|
"test-cljs" ["with-profile" "test" "doo" "node" "test" "once"]
|
||||||
"test-protocol" ["with-profile" "test" "doo" "node" "protocol" "once"]
|
"test-protocol" ["with-profile" "test" "doo" "node" "protocol" "once"]
|
||||||
|
@ -64,7 +64,7 @@
|
||||||
:repl-options {:nrepl-middleware [cider.piggieback/wrap-cljs-repl]
|
:repl-options {:nrepl-middleware [cider.piggieback/wrap-cljs-repl]
|
||||||
:timeout 240000}}
|
:timeout 240000}}
|
||||||
:figwheel [:dev
|
:figwheel [:dev
|
||||||
{:dependencies [[figwheel-sidecar "0.5.16-SNAPSHOT"]
|
{:dependencies [[figwheel-sidecar "0.5.18-SNAPSHOT"]
|
||||||
[re-frisk-remote "0.5.5"]
|
[re-frisk-remote "0.5.5"]
|
||||||
[re-frisk-sidecar "0.5.7"]
|
[re-frisk-sidecar "0.5.7"]
|
||||||
[day8.re-frame/tracing "0.5.0"]
|
[day8.re-frame/tracing "0.5.0"]
|
||||||
|
|
|
@ -69,11 +69,11 @@
|
||||||
(str realm-dir
|
(str realm-dir
|
||||||
"default.realm"))
|
"default.realm"))
|
||||||
|
|
||||||
(defn- delete-realms []
|
(defn delete-realms []
|
||||||
(log/warn "realm: deleting all realms")
|
(log/warn "realm: deleting all realms")
|
||||||
(fs/unlink realm-dir))
|
(fs/unlink realm-dir))
|
||||||
|
|
||||||
(defn- ensure-directories []
|
(defn ensure-directories []
|
||||||
(..
|
(..
|
||||||
(fs/mkdir realm-dir)
|
(fs/mkdir realm-dir)
|
||||||
(then #(fs/mkdir accounts-realm-dir))))
|
(then #(fs/mkdir accounts-realm-dir))))
|
||||||
|
@ -88,7 +88,7 @@
|
||||||
(fs/unlink path)
|
(fs/unlink path)
|
||||||
(fs/move-file path new-path))))
|
(fs/move-file path new-path))))
|
||||||
|
|
||||||
(defn- move-realms []
|
(defn move-realms []
|
||||||
(log/info "realm: moving all realms")
|
(log/info "realm: moving all realms")
|
||||||
(..
|
(..
|
||||||
(fs/read-dir old-realm-dir)
|
(fs/read-dir old-realm-dir)
|
||||||
|
@ -265,7 +265,7 @@
|
||||||
(when realm-list
|
(when realm-list
|
||||||
(into coll (map map-fn) (range 0 (.-length realm-list)))))
|
(into coll (map map-fn) (range 0 (.-length realm-list)))))
|
||||||
|
|
||||||
(defn- list->clj [realm-list]
|
(defn list->clj [realm-list]
|
||||||
(realm-list->clj-coll realm-list [] #(object/get realm-list %)))
|
(realm-list->clj-coll realm-list [] #(object/get realm-list %)))
|
||||||
|
|
||||||
(defn- object-list->clj [realm-object-list entity-name]
|
(defn- object-list->clj [realm-object-list entity-name]
|
||||||
|
|
|
@ -18,7 +18,7 @@
|
||||||
(defmethod invalid-send-parameter? :gas-price [_ value]
|
(defmethod invalid-send-parameter? :gas-price [_ value]
|
||||||
(cond
|
(cond
|
||||||
(not value) :invalid-number
|
(not value) :invalid-number
|
||||||
(< (money/->wei :gwei value) min-gas-price-wei) :not-enough-wei
|
(.lt (money/->wei :gwei value) min-gas-price-wei) :not-enough-wei
|
||||||
(-> (money/->wei :gwei value) .decimalPlaces pos?) :invalid-number))
|
(-> (money/->wei :gwei value) .decimalPlaces pos?) :invalid-number))
|
||||||
|
|
||||||
(defmethod invalid-send-parameter? :default [_ value]
|
(defmethod invalid-send-parameter? :default [_ value]
|
||||||
|
|
|
@ -7,7 +7,7 @@
|
||||||
[status-im.utils.platform :as platform]
|
[status-im.utils.platform :as platform]
|
||||||
[status-im.utils.http :as http]))
|
[status-im.utils.http :as http]))
|
||||||
|
|
||||||
(defn- open-share [content]
|
(defn open-share [content]
|
||||||
(when (or (:message content)
|
(when (or (:message content)
|
||||||
(:url content))
|
(:url content))
|
||||||
(.share react/sharing (clj->js content))))
|
(.share react/sharing (clj->js content))))
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
(ns status-im.ui.screens.group.db
|
(ns status-im.ui.screens.group.db
|
||||||
(:require [cljs.spec.alpha :as spec]))
|
(:require [cljs.spec.alpha :as spec]))
|
||||||
|
|
||||||
(spec/def :group/selected-contacts (spec/nilable (spec/* string?)))
|
(spec/def :group/selected-contacts (spec/nilable (spec/coll-of string? :kind set?)))
|
||||||
|
|
|
@ -40,7 +40,7 @@
|
||||||
:number-of-lines 2}
|
:number-of-lines 2}
|
||||||
(i18n/label :t/maintain-card-to-phone-contact)]])})))
|
(i18n/label :t/maintain-card-to-phone-contact)]])})))
|
||||||
|
|
||||||
(defn- wizard-step [step-number]
|
(defn wizard-step [step-number]
|
||||||
(when step-number
|
(when step-number
|
||||||
[react/text {:style styles/wizard-step-text}
|
[react/text {:style styles/wizard-step-text}
|
||||||
(i18n/label :wizard-step {:current step-number
|
(i18n/label :wizard-step {:current step-number
|
||||||
|
|
|
@ -44,7 +44,7 @@
|
||||||
|
|
||||||
(def default-action (actions/back-white actions/default-handler))
|
(def default-action (actions/back-white actions/default-handler))
|
||||||
|
|
||||||
(defn- toolbar
|
(defn toolbar
|
||||||
([title] (toolbar {} title))
|
([title] (toolbar {} title))
|
||||||
([props title] (toolbar props default-action title))
|
([props title] (toolbar props default-action title))
|
||||||
([props action title] (toolbar props action title nil))
|
([props action title] (toolbar props action title nil))
|
||||||
|
@ -94,7 +94,7 @@
|
||||||
[react/text {:style styles/cartouche-primary-text}
|
[react/text {:style styles/cartouche-primary-text}
|
||||||
s])
|
s])
|
||||||
|
|
||||||
(defn- cartouche-secondary-text [s]
|
(defn cartouche-secondary-text [s]
|
||||||
[react/text {:style styles/cartouche-secondary-text}
|
[react/text {:style styles/cartouche-secondary-text}
|
||||||
s])
|
s])
|
||||||
|
|
||||||
|
@ -273,8 +273,8 @@
|
||||||
[recipient-contact address name request?]
|
[recipient-contact address name request?]
|
||||||
[recipient-address address modal?])]])
|
[recipient-address address modal?])]])
|
||||||
|
|
||||||
(defn- amount-input [{:keys [input-options amount amount-text disabled?]}
|
(defn amount-input [{:keys [input-options amount amount-text disabled?]}
|
||||||
{:keys [symbol decimals]}]
|
{:keys [symbol decimals]}]
|
||||||
[react/view {:style components.styles/flex
|
[react/view {:style components.styles/flex
|
||||||
:accessibility-label :specify-amount-button}
|
:accessibility-label :specify-amount-button}
|
||||||
[text-input
|
[text-input
|
||||||
|
|
|
@ -84,7 +84,7 @@
|
||||||
; We should never receive messages from untrusted peers with a timestamp greater
|
; We should never receive messages from untrusted peers with a timestamp greater
|
||||||
; then now + 20s.
|
; then now + 20s.
|
||||||
; We cap the timestamp to time now + 1 month to give some room for trusted peers
|
; We cap the timestamp to time now + 1 month to give some room for trusted peers
|
||||||
(defn- safe-timestamp [t]
|
(defn safe-timestamp [t]
|
||||||
(min t (max-timestamp)))
|
(min t (max-timestamp)))
|
||||||
|
|
||||||
(defn safe-timestamp? [t]
|
(defn safe-timestamp? [t]
|
||||||
|
|
|
@ -6,7 +6,7 @@
|
||||||
|
|
||||||
(defn sanitize-passphrase [s]
|
(defn sanitize-passphrase [s]
|
||||||
(-> (string/trim s)
|
(-> (string/trim s)
|
||||||
(string/replace-all #"\s+" " ")))
|
(string/replace #"\s+" " ")))
|
||||||
|
|
||||||
(defn passphrase->words [s]
|
(defn passphrase->words [s]
|
||||||
(when s
|
(when s
|
||||||
|
@ -34,4 +34,4 @@
|
||||||
valid-words?))
|
valid-words?))
|
||||||
|
|
||||||
(defn status-generated-phrase? [s]
|
(defn status-generated-phrase? [s]
|
||||||
(every? dictionary (passphrase->words s)))
|
(every? dictionary (passphrase->words s)))
|
||||||
|
|
Loading…
Reference in New Issue