allow nil type of script; alpha release

mvc-works · Jun 22, 2020 · 4a5beee · 4a5beee
1 parent 35d2943
commit 4a5beee
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 10 deletions.
diff --git a/calcit.cirru b/calcit.cirru
@@ -441,16 +441,29 @@
                                                               |j $ {} (:type :leaf) (:by |UI0sFmATo) (:at 1592739558895) (:text |path) (:id |vt4T-GjMC)
                                                             :id |NxMjIzaW30
                                                           |D $ {} (:type :leaf) (:by |UI0sFmATo) (:at 1592739596332) (:text |and) (:id |7dNVwzqbtS)
-                                                          |j $ {} (:type :expr) (:by |UI0sFmATo) (:at 1592739598703)
+                                                          |j $ {} (:type :expr) (:by |UI0sFmATo) (:at 1592796358508)
                                                             :data $ {}
-                                                              |T $ {} (:type :leaf) (:by |UI0sFmATo) (:at 1592739599141) (:text |=) (:id |NA7Y4QKlo)
-                                                              |j $ {} (:type :leaf) (:by |UI0sFmATo) (:at 1592739615443) (:text |:script) (:id |4JDuzfEGeO)
-                                                              |r $ {} (:type :expr) (:by |UI0sFmATo) (:at 1592739601976)
+                                                              |T $ {} (:type :expr) (:by |UI0sFmATo) (:at 1592739598703)
                                                                 :data $ {}
-                                                                  |T $ {} (:type :leaf) (:by |UI0sFmATo) (:at 1592739613022) (:text |:type) (:id |hqWVBCwO8I)
-                                                                  |j $ {} (:type :leaf) (:by |UI0sFmATo) (:at 1592739603246) (:text |path) (:id |lMIVWf1eze)
-                                                                :id |BUITaWc7RM
-                                                            :id |_AMikqFf9i
+                                                                  |T $ {} (:type :leaf) (:by |UI0sFmATo) (:at 1592739599141) (:text |=) (:id |NA7Y4QKlo)
+                                                                  |j $ {} (:type :leaf) (:by |UI0sFmATo) (:at 1592739615443) (:text |:script) (:id |4JDuzfEGeO)
+                                                                  |r $ {} (:type :expr) (:by |UI0sFmATo) (:at 1592739601976)
+                                                                    :data $ {}
+                                                                      |T $ {} (:type :leaf) (:by |UI0sFmATo) (:at 1592739613022) (:text |:type) (:id |hqWVBCwO8I)
+                                                                      |j $ {} (:type :leaf) (:by |UI0sFmATo) (:at 1592739603246) (:text |path) (:id |lMIVWf1eze)
+                                                                    :id |BUITaWc7RM
+                                                                :id |_AMikqFf9i
+                                                              |D $ {} (:type :leaf) (:by |UI0sFmATo) (:at 1592796360375) (:text |or) (:id |iO9tPv1IlD)
+                                                              |j $ {} (:type :expr) (:by |UI0sFmATo) (:at 1592739598703)
+                                                                :data $ {}
+                                                                  |T $ {} (:type :leaf) (:by |UI0sFmATo) (:at 1592796366914) (:text |nil?) (:id |NA7Y4QKlo)
+                                                                  |r $ {} (:type :expr) (:by |UI0sFmATo) (:at 1592739601976)
+                                                                    :data $ {}
+                                                                      |T $ {} (:type :leaf) (:by |UI0sFmATo) (:at 1592739613022) (:text |:type) (:id |hqWVBCwO8I)
+                                                                      |j $ {} (:type :leaf) (:by |UI0sFmATo) (:at 1592739603246) (:text |path) (:id |lMIVWf1eze)
+                                                                    :id |BUITaWc7RM
+                                                                :id |3QMkd8SMf
+                                                            :id |RL10AtqvT
                                                         :id |OTkMqUSR_G
                                                     :id |tLVi4S1jK_
                                                   |v $ {} (:type :expr) (:by |UI0sFmATo) (:at 1592739620363)

diff --git a/release.edn b/release.edn
@@ -1,4 +1,4 @@
-{:version "0.1.13-a2",
+{:version "0.1.13-a3",
  :group-id "mvc-works",
  :artifact-id "shell-page",
  :skip-tag true,

diff --git a/src/shell_page/core.cljs b/src/shell_page/core.cljs
@@ -64,7 +64,7 @@
                     {:type "module",
                      :src (:src path),
                      :defer (if (:defer? path) true false)})
-                 (and (map? path) (= :script (:type path)))
+                 (and (map? path) (or (= :script (:type path)) (nil? (:type path))))
                    (script {:src (:src path), :defer (if (:defer? path) true false)})
                  :else (println "[Shell Page]: unknown path" path))))))))
     (body