diff --git a/shadow-cljs.edn b/shadow-cljs.edn index 905bc03..edc7fc8 100644 --- a/shadow-cljs.edn +++ b/shadow-cljs.edn @@ -18,12 +18,10 @@ {:scittle {:entries [scittle.core]} :scittle.reagent {:entries [scittle.reagent] :depends-on #{:scittle}} - :scittle.ajax {:entries [scittle.ajax] - :depends-on #{:scittle}} + :scittle.cljs-ajax {:entries [scittle.cljs-ajax] + :depends-on #{:scittle}} :scittle.qlkit {:entries [scittle.qlkit] - :depends-on #{:scittle}} - :scittle.cljs {:entries [scittle.cljs] - :depends-on #{:scittle}}} + :depends-on #{:scittle}}} :build-hooks [(shadow.cljs.build-report/hook)] :output-dir "resources/public/js" :devtools {:repl-pprint true} diff --git a/src/scittle/cljs.cljs b/src/scittle/cljs.cljs deleted file mode 100644 index 3f113a8..0000000 --- a/src/scittle/cljs.cljs +++ /dev/null @@ -1,13 +0,0 @@ -(ns scittle.cljs - (:require [cljs.reader :refer [read-string]] - [sci.core :as sci] - [scittle.core :as scittle])) - -(def rns (sci/create-ns 'cljs.reader nil)) - -(def cljs-reader-namespace - {'read-string (sci/copy-var read-string rns)}) - -(scittle/register-plugin! - ::ajax - {:namespaces {'cljs.reader cljs-reader-namespace}}) diff --git a/src/scittle/ajax.cljs b/src/scittle/cljs_ajax.cljs similarity index 93% rename from src/scittle/ajax.cljs rename to src/scittle/cljs_ajax.cljs index cbec76b..d8f3384 100644 --- a/src/scittle/ajax.cljs +++ b/src/scittle/cljs_ajax.cljs @@ -1,4 +1,4 @@ -(ns scittle.ajax +(ns scittle.cljs-ajax (:require [ajax.core :as ajx] [sci.core :as sci] [scittle.core :as scittle])) diff --git a/src/scittle/core.cljs b/src/scittle/core.cljs index a6cde42..db86965 100644 --- a/src/scittle/core.cljs +++ b/src/scittle/core.cljs @@ -3,7 +3,8 @@ (:require [goog.object :as gobject] [goog.string] [sci.core :as sci] - [scittle.impl.error :as error])) + [scittle.impl.error :as error] + [cljs.reader :refer [read-string]])) (clojure.core/defmacro time "Evaluates expr and prints the time it took. Returns the value of expr." @@ -17,6 +18,7 @@ (def stns (sci/create-ns 'sci.script-tag nil)) (def cljns (sci/create-ns 'clojure.core nil)) +(def rns (sci/create-ns 'cljs.reader nil)) (def namespaces {'clojure.core @@ -24,7 +26,8 @@ 'prn prn 'system-time system-time 'time (sci/copy-var time cljns) - 'random-uuid random-uuid} + 'random-uuid random-uuid + 'read-string (sci/copy-var read-string rns)} 'goog.object {'set gobject/set 'get gobject/get}})