diff --git a/calcit.cirru b/calcit.cirru index 33882c9..7dad414 100644 --- a/calcit.cirru +++ b/calcit.cirru @@ -13609,34 +13609,40 @@ |r $ {} (:type :expr) (:by |root) (:at 1546166213786) :data $ {} |T $ {} (:type :leaf) (:by |root) (:at 1546166213786) (:text |{}) + |yr $ {} (:type :expr) (:by |S1lNv50FW) (:at 1606287420142) + :data $ {} + |T $ {} (:type :leaf) (:by |S1lNv50FW) (:at 1606287423195) (:text |:modules) + |j $ {} (:type :expr) (:by |S1lNv50FW) (:at 1606287423505) + :data $ {} + |T $ {} (:type :leaf) (:by |S1lNv50FW) (:at 1606287423660) (:text |[]) + |yT $ {} (:type :expr) (:by |S1lNv50FW) (:at 1599733029770) + :data $ {} + |T $ {} (:type :leaf) (:by |S1lNv50FW) (:at 1599733031450) (:text |:init-fn) + |j $ {} (:type :leaf) (:by |S1lNv50FW) (:at 1599733043446) (:text "|\"app.main/main!") |j $ {} (:type :expr) (:by |root) (:at 1546166213786) :data $ {} |T $ {} (:type :leaf) (:by |root) (:at 1546166213786) (:text |:extension) |j $ {} (:type :leaf) (:by |root) (:at 1546166213786) (:text "|\".cljs") - |r $ {} (:type :expr) (:by |root) (:at 1546166213786) + |x $ {} (:type :expr) (:by |root) (:at 1546166283194) :data $ {} - |T $ {} (:type :leaf) (:by |root) (:at 1546166213786) (:text |:output) - |j $ {} (:type :leaf) (:by |root) (:at 1546166213786) (:text "|\"src") + |T $ {} (:type :leaf) (:by |root) (:at 1546166299320) (:text |:local-ui?) + |j $ {} (:type :leaf) (:by |root) (:at 1546166299981) (:text |false) |v $ {} (:type :expr) (:by |root) (:at 1546166216699) :data $ {} |T $ {} (:type :leaf) (:by |root) (:at 1546166217613) (:text |:port) |j $ {} (:type :leaf) (:by |root) (:at 1546166219604) (:text |6001) - |x $ {} (:type :expr) (:by |root) (:at 1546166283194) + |yj $ {} (:type :expr) (:by |S1lNv50FW) (:at 1599733044130) :data $ {} - |T $ {} (:type :leaf) (:by |root) (:at 1546166299320) (:text |:local-ui?) - |j $ {} (:type :leaf) (:by |root) (:at 1546166299981) (:text |false) + |T $ {} (:type :leaf) (:by |S1lNv50FW) (:at 1599733047074) (:text |:reload-fn) + |j $ {} (:type :leaf) (:by |S1lNv50FW) (:at 1599733050959) (:text "|\"app.main/reload!") + |r $ {} (:type :expr) (:by |root) (:at 1546166213786) + :data $ {} + |T $ {} (:type :leaf) (:by |root) (:at 1546166213786) (:text |:output) + |j $ {} (:type :leaf) (:by |root) (:at 1546166213786) (:text "|\"src") |y $ {} (:type :expr) (:by |S1lNv50FW) (:at 1596297321141) :data $ {} |T $ {} (:type :leaf) (:by |S1lNv50FW) (:at 1596297332084) (:text |:compact-output?) |j $ {} (:type :leaf) (:by |S1lNv50FW) (:at 1599733023435) (:text |false) - |yT $ {} (:type :expr) (:by |S1lNv50FW) (:at 1599733029770) - :data $ {} - |T $ {} (:type :leaf) (:by |S1lNv50FW) (:at 1599733031450) (:text |:init-fn) - |j $ {} (:type :leaf) (:by |S1lNv50FW) (:at 1599733043446) (:text "|\"app.main/main!") - |yj $ {} (:type :expr) (:by |S1lNv50FW) (:at 1599733044130) - :data $ {} - |T $ {} (:type :leaf) (:by |S1lNv50FW) (:at 1599733047074) (:text |:reload-fn) - |j $ {} (:type :leaf) (:by |S1lNv50FW) (:at 1599733050959) (:text "|\"app.main/reload!") |user $ {} (:type :expr) (:at 1504777570689) :data $ {} |T $ {} (:type :leaf) (:by |root) (:at 1504777570689) (:text |def) @@ -22123,6 +22129,13 @@ |T $ {} (:type :leaf) (:by |S1lNv50FW) (:at 1599733152715) (:text |configs) |D $ {} (:type :leaf) (:by |S1lNv50FW) (:at 1599733297959) (:text |:reload-fn) |D $ {} (:type :leaf) (:by |S1lNv50FW) (:at 1599733296310) (:text |:reload-fn) + |r $ {} (:type :expr) (:by |S1lNv50FW) (:at 1606286816878) + :data $ {} + |T $ {} (:type :leaf) (:by |S1lNv50FW) (:at 1606286821525) (:text |:modules) + |j $ {} (:type :expr) (:by |S1lNv50FW) (:at 1606286822071) + :data $ {} + |T $ {} (:type :leaf) (:by |S1lNv50FW) (:at 1606286829014) (:text |:modules) + |j $ {} (:type :leaf) (:by |S1lNv50FW) (:at 1606286831681) (:text |configs) |j $ {} (:type :expr) (:by |S1lNv50FW) (:at 1596336845843) :data $ {} |T $ {} (:type :leaf) (:by |S1lNv50FW) (:at 1596336850628) (:text |inc-data) diff --git a/package.json b/package.json index 7a7640a..9e128f0 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "calcit-editor", - "version": "0.5.18-a5", + "version": "0.5.18-a6", "description": "Cirru Calcit Editor", "bin": { "calcit-editor": "dist/server.js", diff --git a/shadow-cljs.edn b/shadow-cljs.edn index 7442fde..5b7cafc 100644 --- a/shadow-cljs.edn +++ b/shadow-cljs.edn @@ -9,14 +9,14 @@ [mvc-works/ws-edn "0.1.4"] [respo "0.13.4"] [respo/ui "0.3.16"] - [respo/markdown "0.2.6-a1"] + [respo/markdown "0.2.6"] [respo/alerts "0.5.5"] [respo/feather "0.1.1"] [cumulo/recollect "0.6.3"] [cumulo/util "0.1.12"] [fipp "0.6.23"] [cirru/sepal "0.2.9"] - [cirru/writer "0.1.8-a3"] + [cirru/writer "0.1.8"] [cirru/bisection-key "0.1.6"] [cirru/edn "0.0.10"] [medley "1.3.0"] diff --git a/src/app/schema.cljs b/src/app/schema.cljs index 7fe272f..e73efed 100644 --- a/src/app/schema.cljs +++ b/src/app/schema.cljs @@ -10,7 +10,8 @@ :local-ui? false, :compact-output? false, :init-fn "app.main/main!", - :reload-fn "app.main/reload!"}) + :reload-fn "app.main/reload!", + :modules []}) (def ir-file {:package "app", :files {}}) diff --git a/src/app/util/compile.cljs b/src/app/util/compile.cljs index 7a25219..aec26e1 100644 --- a/src/app/util/compile.cljs +++ b/src/app/util/compile.cljs @@ -30,7 +30,8 @@ configs] (let [compact-data {:package pkg, :configs {:init-fn (:init-fn configs), - :reload-fn (:reload-fn configs)}, + :reload-fn (:reload-fn configs), + :modules (:modules configs)}, :files (->> new-files (map (fn [[ns-text file]] [ns-text (file->cirru file)])) (into {}))}