Skip to content

Commit 6bff286

Browse files
committed
upgrade deps; update workflow; bump 0.2.4
1 parent eee2266 commit 6bff286

File tree

18 files changed

+4025
-3597
lines changed

18 files changed

+4025
-3597
lines changed

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ Demo http://repo.respo.site/value/
1111
[![Clojars Project](https://img.shields.io/clojars/v/respo/value.svg)](https://clojars.org/respo/value)
1212

1313
```clojure
14-
[respo/value "0.2.3"]
14+
[respo/value "0.2.4"]
1515
```
1616

1717
```clojure

build.boot

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
:username "jiyinyiyong"
1010
:password (read-password "Clojars password: ")}]))
1111

12-
(def +version+ "0.2.3")
12+
(def +version+ "0.2.4")
1313

1414
(deftask deploy []
1515
(comp

coir.edn

Lines changed: 3832 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

entry/dev.js

Lines changed: 0 additions & 1 deletion
This file was deleted.

entry/release.js

Lines changed: 0 additions & 1 deletion
This file was deleted.

package.json

Lines changed: 11 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -12,33 +12,19 @@
1212
"release": "shadow-cljs release browser",
1313
"watch": "shadow-cljs watch browser",
1414
"compile-ssr": "shadow-cljs compile ssr",
15-
"html-dev": "env=dev node target/ssr.js",
16-
"html": "node target/ssr.js",
17-
"hmr": "webpack-dev-server --config webpack.dev.coffee --hot-only",
18-
"webpack": "webpack --config webpack.release.coffee --hide-modules --progress",
19-
"dev": "yarn compile-ssr && yarn html-dev && yarn dev-manifest && yarn hmr",
15+
"html-dev": "env=dev node target/ssr.js && cp entry/manifest.json target/",
16+
"html": "node target/ssr.js && cp entry/manifest.json dist/",
17+
"index.html": "yarn compile-ssr && yarn html-dev",
2018
"del": "rm -rf dist/*",
21-
"serve": "http-server dist",
22-
"dev-manifest": "cp entry/manifest.json target/",
23-
"manifest": "cp entry/manifest.json dist/",
24-
"build": "yarn del && yarn release && yarn webpack && yarn compile-ssr && yarn html && yarn manifest"
19+
"serve": "http-server dist -s",
20+
"build": "yarn del && yarn release && yarn compile-ssr && yarn html",
21+
"build2": "shadow-cljs clj-run build.release/-main"
22+
2523
},
2624
"devDependencies": {
27-
"css-loader": "^0.28.7",
28-
"extract-text-webpack-plugin": "^3.0.1",
29-
"file-loader": "^1.1.5",
30-
"http-server": "^0.10.0",
31-
"shadow-cljs": "^2.0.18",
32-
"shortid": "^2.2.8",
33-
"source-map-loader": "^0.2.2",
34-
"style-loader": "^0.19.0",
35-
"uglifyjs-webpack-plugin": "^1.0.0-beta.3",
36-
"url-loader": "^0.6.2",
37-
"webpack": "^3.7.1",
38-
"webpack-dev-server": "^2.9.2",
39-
"webpack-manifest-plugin": "^1.3.2"
25+
"http-server": "^0.11.1",
26+
"shadow-cljs": "^2.0.131",
27+
"shortid": "^2.2.8"
4028
},
41-
"dependencies": {
42-
"coffeescript": "^2.0.1"
43-
}
29+
"dependencies": {}
4430
}

shadow-cljs.edn

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,24 @@
11

22
{:source-paths ["src"]
33
:dependencies [[mvc-works/hsl "0.1.2"]
4-
[mvc-works/shell-page "0.1.5"]
5-
[respo/ui "0.2.0"]
6-
[respo "0.7.1"]]
4+
[mvc-works/shell-page "0.1.6"]
5+
[respo/ui "0.2.4"]
6+
[respo "0.8.7"]]
77
:open-file-command ["subl" ["%s:%s:%s" :file :line :column]]
88
:builds {:browser {:target :browser
9-
:output-dir "target/browser"
10-
:asset-path "/browser"
9+
:output-dir "target/"
10+
:asset-path "./"
1111
:modules {:main {:entries [respo-value.main]
1212
:depends-on #{:lib}}
1313
:lib {:entries [respo.core respo.macros
1414
respo.comp.inspect]}}
1515
:devtools {:after-load respo-value.main/reload!
16-
:preloads [shadow.cljs.devtools.client.hud]}
16+
:preloads [shadow.cljs.devtools.client.hud]
17+
:http-root "target"
18+
:http-port 7000}
1719
:release {:output-dir "dist/"
1820
:module-hash-names 8
19-
:build-options {:manifest-name "cljs-manifest.json"}}}
21+
:build-options {:manifest-name "assets.edn"}}}
2022
:ssr {:target :node-script
2123
:output-to "target/ssr.js"
2224
:main respo-value.render/main!

src/build/release.clj

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
2+
(ns build.release
3+
(:require [shadow.cljs.devtools.api :as api]
4+
[shadow.cljs.devtools.server :as server]
5+
[clojure.java.shell :refer [sh]]))
6+
7+
(defn -main []
8+
(println (sh "rm" "-rf" "dist/*"))
9+
(api/release :browser)
10+
(api/compile :ssr)
11+
(println (sh "node" "target/ssr.js"))
12+
(println (sh "cp" "entry/manifest.json" "dist/")))

src/respo_value/comp/container.cljs

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,16 @@
1111

1212
(def style-section {:display "flex", :font-family "Verdana", :padding "8px 8px"})
1313

14+
(def style-value {})
15+
16+
(defcomp
17+
comp-section
18+
(states hint value)
19+
(div
20+
{:style style-section}
21+
(span {:inner-text hint, :style widget/style-hint})
22+
(div {:style style-value} (cursor-> hint comp-value states value 0))))
23+
1424
(def data-table
1525
[["a nil:" nil]
1626
["a number:" schema/a-number]
@@ -27,16 +37,6 @@
2737
["a mixed data:" schema/a-mixed-data]
2838
["an element" (div {} (div {:style style-section}) (=< 8 nil))]])
2939

30-
(def style-value {})
31-
32-
(defcomp
33-
comp-section
34-
(states hint value)
35-
(div
36-
{:style style-section}
37-
(span {:inner-text hint, :style widget/style-hint})
38-
(div {:style style-value} (cursor-> hint comp-value states value 0))))
39-
4040
(defcomp
4141
comp-container
4242
(store)

src/respo_value/comp/value.cljs

Lines changed: 55 additions & 55 deletions
Original file line numberDiff line numberDiff line change
@@ -20,19 +20,54 @@
2020

2121
(declare comp-value)
2222

23-
(defcomp comp-nil () (<> span "nil" widget/literal))
24-
25-
(defcomp comp-string (x) (<> span (pr-str x) widget/literal))
23+
(defcomp comp-bool (x) (<> span (str x) widget/literal))
2624

2725
(defcomp comp-function () (<> span "fn" widget/literal))
2826

2927
(defcomp comp-keyword (x) (<> span (str x) widget/literal))
3028

31-
(defn toggle-folding [folded?] (fn [e d! m!] (m! (not folded?))))
29+
(defcomp comp-nil () (<> span "nil" widget/literal))
3230

3331
(defcomp comp-number (x) (<> span (str x) widget/literal))
3432

35-
(defcomp comp-bool (x) (<> span (str x) widget/literal))
33+
(defcomp comp-string (x) (<> span (pr-str x) widget/literal))
34+
35+
(defn toggle-folding [folded?] (fn [e d! m!] (m! (not folded?))))
36+
37+
(defn render-fields [states %cursor xs level]
38+
(list->
39+
:div
40+
{:style (merge widget/style-children layout/column)}
41+
(->> xs
42+
(map-indexed
43+
(fn [index field]
44+
[index
45+
(div
46+
{:style layout/row}
47+
(comp-value states (first field) 0)
48+
(cursor-> index comp-value states (last field) (inc level)))])))))
49+
50+
(defn render-children [states %cursor xs level]
51+
(list->
52+
:div
53+
{:style (merge widget/style-children layout/column)}
54+
(->> xs
55+
(map-indexed
56+
(fn [index child] [index (cursor-> index comp-value states child (inc level))])))))
57+
58+
(defcomp
59+
comp-vector
60+
(states x level)
61+
(let [folded? (if (some? (:data states)) (:data states) (> level 1))]
62+
(if (and folded? (not (empty? x)))
63+
(div
64+
{:style (merge widget/structure decoration/folded),
65+
:on-click (toggle-folding folded?)}
66+
(<> span (str "[]~" (count x)) widget/only-text))
67+
(div
68+
{:style (merge widget/structure layout/row), :on-click (toggle-folding folded?)}
69+
(<> span (str "[]") widget/only-text)
70+
(render-children states %cursor x level)))))
3671

3772
(defcomp
3873
comp-value
@@ -52,79 +87,44 @@
5287
:else
5388
(div {:style widget/style-unknown, :attrs {:inner-text (str "unknown" (pr-str x))}}))))
5489

55-
(defcomp
56-
comp-vector
57-
(states x level)
58-
(let [folded? (if (some? (:data states)) (:data states) (> level 1))]
59-
(if (and folded? (not (empty? x)))
60-
(div
61-
{:style (merge widget/structure decoration/folded),
62-
:event {:click (toggle-folding folded?)}}
63-
(<> span (str "[]~" (count x)) widget/only-text))
64-
(div
65-
{:style (merge widget/structure layout/row), :event {:click (toggle-folding folded?)}}
66-
(<> span (str "[]") widget/only-text)
67-
(render-children states *cursor* x level)))))
68-
6990
(defcomp
7091
comp-set
7192
(states x level)
7293
(let [folded? (if (some? (:data states)) (:data states) (>= level 1))]
7394
(if (and folded? (not (empty? x)))
7495
(div
7596
{:style (merge widget/structure decoration/folded),
76-
:event {:click (toggle-folding folded?)}}
97+
:on-click (toggle-folding folded?)}
7798
(<> span (str "#{}~" (count x)) widget/only-text))
7899
(div
79-
{:style (merge widget/structure layout/row), :event {:click (toggle-folding folded?)}}
100+
{:style (merge widget/structure layout/row), :on-click (toggle-folding folded?)}
80101
(<> span (str "#{}") widget/only-text)
81-
(render-children states *cursor* x level)))))
102+
(render-children states %cursor x level)))))
82103

83104
(defcomp
84-
comp-list
105+
comp-map
85106
(states x level)
86107
(let [folded? (if (some? (:data states)) (:data states) (>= level 1))]
87108
(if (and folded? (not (empty? x)))
88109
(div
89110
{:style (merge widget/structure decoration/folded),
90-
:event {:click (toggle-folding folded?)}}
91-
(<> span (str "'()~" (count x)) widget/only-text))
111+
:on-click (toggle-folding folded?)}
112+
(<> span (str "{}~" (count x)) widget/only-text))
92113
(div
93-
{:style (merge widget/structure layout/row), :event {:click (toggle-folding folded?)}}
94-
(<> span (str "'()") widget/only-text)
95-
(render-children states *cursor* x level)))))
96-
97-
(defn render-fields [states *cursor* xs level]
98-
(list->
99-
:div
100-
{:style (merge widget/style-children layout/column)}
101-
(->> xs
102-
(map-indexed
103-
(fn [index field]
104-
[index
105-
(div
106-
{:style layout/row}
107-
(comp-value states (first field) 0)
108-
(cursor-> index comp-value states (last field) (inc level)))])))))
109-
110-
(defn render-children [states *cursor* xs level]
111-
(list->
112-
:div
113-
{:style (merge widget/style-children layout/column)}
114-
(->> xs
115-
(map-indexed
116-
(fn [index child] [index (cursor-> index comp-value states child (inc level))])))))
114+
{:style (merge widget/structure layout/row), :on-click (toggle-folding folded?)}
115+
(<> span "{}" widget/only-text)
116+
(render-fields states %cursor x level)))))
117117

118118
(defcomp
119-
comp-map
119+
comp-list
120120
(states x level)
121121
(let [folded? (if (some? (:data states)) (:data states) (>= level 1))]
122122
(if (and folded? (not (empty? x)))
123123
(div
124124
{:style (merge widget/structure decoration/folded),
125-
:event {:click (toggle-folding folded?)}}
126-
(<> span (str "{}~" (count x)) widget/only-text))
125+
:on-click (toggle-folding folded?)}
126+
(<> span (str "'()~" (count x)) widget/only-text))
127127
(div
128-
{:style (merge widget/structure layout/row), :event {:click (toggle-folding folded?)}}
129-
(<> span "{}" widget/only-text)
130-
(render-fields states *cursor* x level)))))
128+
{:style (merge widget/structure layout/row), :on-click (toggle-folding folded?)}
129+
(<> span (str "'()") widget/only-text)
130+
(render-children states %cursor x level)))))

0 commit comments

Comments
 (0)