Skip to content

Commit

Permalink
assert map in handling component; bump 0.8.16
Browse files Browse the repository at this point in the history
  • Loading branch information
tiye committed Mar 10, 2018
1 parent 97351a1 commit 8262a78
Show file tree
Hide file tree
Showing 7 changed files with 46 additions and 15 deletions.
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -2,3 +2,5 @@
/target/
/node_modules/
/dist/
.shadow-cljs/
.cpcache/
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ Respo: A virtual DOM library in ClojureScript
[![Respo](https://img.shields.io/clojars/v/respo/respo.svg)](https://clojars.org/respo/respo)

```clojure
[respo "0.8.15"]
[respo "0.8.16"]
```

* Home http://respo.site
Expand Down
5 changes: 2 additions & 3 deletions build.boot
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,12 @@

(set-env!
:resource-paths #{"polyfill" "src"}
:dependencies '[[mvc-works/hsl "0.1.2" :scope "provided"]
[mvc-works/polyfill "0.1.1"]]
:dependencies '[]
:repositories #(conj % ["clojars" {:url "https://clojars.org/repo/"
:username "jiyinyiyong"
:password (read-password "Clojars password: ")}]))

(def +version+ "0.8.15")
(def +version+ "0.8.16")

(deftask deploy []
(comp
Expand Down
34 changes: 32 additions & 2 deletions calcit.edn
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
{
:ir {
:package "respo", :extension ".cljc"
:root {:ns "app.core", :def "render-app!"}
:package "respo"
:files {
"respo.app.comp.container" {
:ns {
Expand Down Expand Up @@ -11493,6 +11492,33 @@
"v" {:type :leaf, :id "BksToGgutCK-", :text "old-element", :by "root", :at 1504774121421}
}
}
"t" {
:type :expr, :by "root", :at 1520658988373, :id "B1gEN9JWKz"
:data {
"T" {:type :leaf, :by "root", :at 1520658990530, :text "assert", :id "B1gEN9JWKzleaf"}
"j" {
:type :expr, :by "root", :at 1520658996408, :id "r1l2EcJWKG"
:data {
"T" {:type :leaf, :by "root", :at 1520658997882, :text "map?", :id "BJ2VqyWYf"}
"j" {:type :leaf, :by "root", :at 1520659001447, :text "markup", :id "rJgC491-Ff"}
}
}
"r" {
:type :expr, :by "root", :at 1520659029092, :id "Ska8qy-YG"
:data {
"D" {:type :leaf, :by "root", :at 1520659032100, :text "str", :id "rkkwc1WYM"}
"T" {:type :leaf, :by "root", :at 1520659030273, :text "|component markup should be a map, but got: ", :id "H1mrq1-Ff"}
"j" {
:type :expr, :by "root", :at 1520659032986, :id "SJlZPcyWYf"
:data {
"T" {:type :leaf, :by "root", :at 1520659033943, :text "pr-str", :id "S1bvcJ-KM"}
"j" {:type :leaf, :by "root", :at 1520659035169, :text "markup", :id "HJXzwcybtM"}
}
}
}
}
}
}
"v" {
:type :expr, :id "Sy2aiMeuFRK-", :by nil, :at 1504774121421
:data {
Expand Down Expand Up @@ -18929,4 +18955,8 @@
}
:saved-files {}
:configs {:storage-key "calcit.edn", :extension ".cljs", :output "src", :port 6001}
:repl {
:alive? false
:logs {}
}
}
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,8 @@
"dependencies": {},
"devDependencies": {
"http-server": "^0.11.1",
"shadow-cljs": "^2.1.26",
"shadow-cljs": "^2.2.6",
"source-map-support": "^0.5.3",
"ws": "^4.1.0"
"ws": "^5.0.0"
}
}
1 change: 1 addition & 0 deletions src/respo/render/expand.cljs
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@
(assoc markup :coord coord :children child-elements)))

(defn render-component [markup coord cursor old-element]
(assert (map? markup) (str "component markup should be a map, but got: " (pr-str markup)))
(if (and (some? old-element)
(= (:name markup) (:name old-element))
(=seq (:args markup) (:args old-element)))
Expand Down
13 changes: 6 additions & 7 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -1194,9 +1194,9 @@ [email protected]:
version "1.1.2"
resolved "https://registry.yarnpkg.com/shadow-cljs-jar/-/shadow-cljs-jar-1.1.2.tgz#88664fae5957a7c21554e1a33476f1c475162c92"

shadow-cljs@^2.1.26:
version "2.1.26"
resolved "https://registry.yarnpkg.com/shadow-cljs/-/shadow-cljs-2.1.26.tgz#32f5c50b9d6d361265bac32158a2d8d8f290d3a5"
shadow-cljs@^2.2.6:
version "2.2.6"
resolved "https://registry.yarnpkg.com/shadow-cljs/-/shadow-cljs-2.2.6.tgz#4816c6104fa967ac2e54cda2ce733eead4fdee7c"
dependencies:
babel-core "^6.26.0"
babel-preset-env "^1.6.0"
Expand Down Expand Up @@ -1344,12 +1344,11 @@ ws@^3.0.0:
safe-buffer "~5.1.0"
ultron "~1.1.0"

ws@^4.1.0:
version "4.1.0"
resolved "https://registry.yarnpkg.com/ws/-/ws-4.1.0.tgz#a979b5d7d4da68bf54efe0408967c324869a7289"
ws@^5.0.0:
version "5.0.0"
resolved "https://registry.yarnpkg.com/ws/-/ws-5.0.0.tgz#fb4ede3fddcff99b157d292a1069ace8d6e04db9"
dependencies:
async-limiter "~1.0.0"
safe-buffer "~5.1.0"

xtend@^4.0.0:
version "4.0.1"
Expand Down

0 comments on commit 8262a78

Please sign in to comment.