Skip to content

Commit f02053f

Browse files
tiyetiye
committed
replace workflow
1 parent d0ca0b7 commit f02053f

File tree

8 files changed

+795
-1372
lines changed

8 files changed

+795
-1372
lines changed

‎.github/workflows/upload.yaml‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ name: Upload
33
on:
44
push:
55
branches:
6-
- master
76
- main
87
pull_request: {}
98

@@ -32,7 +31,7 @@ jobs:
3231
- name: add cr
3332
run: |
3433
mkdir -p $GITHUB_WORKSPACE/bin
35-
wget -O $GITHUB_WORKSPACE/bin/cr http://repo.calcit-lang.org/binaries/linux/cr
34+
wget -O $GITHUB_WORKSPACE/bin/cr https://github.com/calcit-lang/calcit/releases/download/0.6.4/cr
3635
chmod +x $GITHUB_WORKSPACE/bin/cr
3736
echo "::add-path::$GITHUB_WORKSPACE/bin"
3837

‎calcit.cirru‎

Lines changed: 623 additions & 1198 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎compact.cirru‎

Lines changed: 72 additions & 72 deletions
Original file line numberDiff line numberDiff line change
@@ -1,51 +1,10 @@
11

22
{} (:package |text-diff)
3-
:configs $ {} (:init-fn |text-diff.main/main!) (:reload-fn |text-diff.main/reload!)
3+
:configs $ {} (:init-fn |text-diff.main/main!) (:reload-fn |text-diff.main/reload!) (:version nil)
44
:modules $ [] |respo.calcit/ |lilac/ |memof/ |respo-ui.calcit/ |respo-markdown.calcit/ |reel.calcit/
5-
:version nil
5+
:entries $ {}
66
:files $ {}
7-
|text-diff.config $ {}
8-
:ns $ quote (ns text-diff.config)
9-
:defs $ {}
10-
|cdn? $ quote
11-
def cdn? $ cond
12-
exists? js/window
13-
, false
14-
(exists? js/process) (= "\"true" js/process.env.cdn)
15-
:else false
16-
|dev? $ quote
17-
def dev? $ = "\"dev" (get-env "\"mode")
18-
|site $ quote
19-
def site $ {} (:dev-ui "\"http://localhost:8100/main-fonts.css") (:release-ui "\"http://cdn.tiye.me/favored-fonts/main-fonts.css") (:cdn-url "\"http://cdn.tiye.me/calcit-workflow/") (:title "\"Calcit") (:icon "\"http://cdn.tiye.me/logo/mvc-works.png") (:storage-key "\"workflow")
20-
|text-diff.schema $ {}
21-
:ns $ quote (ns text-diff.schema)
22-
:defs $ {}
23-
|store $ quote
24-
def store $ {}
25-
:states $ {}
26-
:content |
27-
|text-diff.updater $ {}
28-
:ns $ quote
29-
ns text-diff.updater $ :require
30-
[] respo.cursor :refer $ [] update-states
31-
:defs $ {}
32-
|updater $ quote
33-
defn updater (store op op-data op-id op-time)
34-
case-default op
35-
do (println "\"Unknown op:" op) store
36-
:states $ update-states store op-data
37-
:content $ assoc store :content op-data
38-
:hydrate-storage op-data
397
|text-diff.comp.container $ {}
40-
:ns $ quote
41-
ns text-diff.comp.container $ :require
42-
[] hsl.core :refer $ [] hsl
43-
[] respo-ui.core :as ui
44-
[] respo.core :refer $ [] defcomp >> <> div button textarea span input
45-
[] respo.comp.space :refer $ [] =<
46-
[] reel.comp.reel :refer $ [] comp-reel
47-
[] respo-md.comp.md :refer $ [] comp-md
48-
[] text-diff.config :refer $ [] dev?
498
:defs $ {}
509
|comp-container $ quote
5110
defcomp comp-container (reel)
@@ -68,56 +27,97 @@
6827
=< |8px nil
6928
button $ {} (:style ui/button)
7029
:inner-text $ str |run
71-
:on-click $ fn (e d! m!)
30+
:on-click $ fn (e d!)
7231
println $ :content store
7332
when dev? $ comp-reel (>> states :reel) reel ({})
74-
|text-diff.main $ {}
7533
:ns $ quote
76-
ns text-diff.main $ :require
77-
[] respo.core :refer $ [] render! clear-cache! realize-ssr!
78-
[] text-diff.comp.container :refer $ [] comp-container
79-
[] text-diff.updater :refer $ [] updater
80-
[] text-diff.schema :as schema
81-
[] reel.util :refer $ [] listen-devtools!
82-
[] reel.core :refer $ [] reel-updater refresh-reel
83-
reel.schema :as reel-schema
84-
[] text-diff.config :as config
85-
"\"./calcit.build-errors" :default build-errors
86-
"\"bottom-tip" :default hud!
34+
ns text-diff.comp.container $ :require
35+
[] hsl.core :refer $ [] hsl
36+
[] respo-ui.core :as ui
37+
[] respo.core :refer $ [] defcomp >> <> div button textarea span input
38+
[] respo.comp.space :refer $ [] =<
39+
[] reel.comp.reel :refer $ [] comp-reel
40+
[] respo-md.comp.md :refer $ [] comp-md
41+
[] text-diff.config :refer $ [] dev?
42+
|text-diff.config $ {}
43+
:defs $ {}
44+
|cdn? $ quote
45+
def cdn? $ cond
46+
exists? js/window
47+
, false
48+
(exists? js/process) (= "\"true" js/process.env.cdn)
49+
:else false
50+
|dev? $ quote
51+
def dev? $ = "\"dev" (get-env "\"mode" "\"release")
52+
|site $ quote
53+
def site $ {} (:dev-ui "\"http://localhost:8100/main-fonts.css") (:release-ui "\"http://cdn.tiye.me/favored-fonts/main-fonts.css") (:cdn-url "\"http://cdn.tiye.me/calcit-workflow/") (:title "\"Calcit") (:icon "\"http://cdn.tiye.me/logo/mvc-works.png") (:storage-key "\"workflow")
54+
:ns $ quote (ns text-diff.config)
55+
|text-diff.main $ {}
8756
:defs $ {}
88-
|render-app! $ quote
89-
defn render-app! () $ render! mount-target (comp-container @*reel) dispatch!
90-
|persist-storage! $ quote
91-
defn persist-storage! (? e)
92-
.setItem js/localStorage (:storage-key config/site)
93-
format-cirru-edn $ :store @*reel
94-
|mount-target $ quote
95-
def mount-target $ .querySelector js/document |.app
9657
|*reel $ quote
9758
defatom *reel $ -> reel-schema/reel (assoc :base schema/store) (assoc :store schema/store)
59+
|dispatch! $ quote
60+
defn dispatch! (op op-data)
61+
when config/dev? $ println "\"Dispatch:" op
62+
reset! *reel $ reel-updater updater @*reel op op-data
9863
|main! $ quote
9964
defn main! ()
10065
println "\"Running mode:" $ if config/dev? "\"dev" "\"release"
10166
render-app!
10267
add-watch *reel :changes $ fn (r p) (render-app!)
10368
listen-devtools! |a dispatch!
104-
.addEventListener js/window |beforeunload persist-storage!
69+
js/window.addEventListener |beforeunload persist-storage!
10570
; repeat! 60 persist-storage!
10671
let
107-
raw $ .getItem js/localStorage (:storage-key config/site)
72+
raw $ js/localStorage.getItem (:storage-key config/site)
10873
when (some? raw)
10974
dispatch! :hydrate-storage $ parse-cirru-edn raw
11075
println "|App started."
111-
|snippets $ quote
112-
defn snippets () $ println config/cdn?
113-
|dispatch! $ quote
114-
defn dispatch! (op op-data)
115-
when config/dev? $ println "\"Dispatch:" op
116-
reset! *reel $ reel-updater updater @*reel op op-data
76+
|mount-target $ quote
77+
def mount-target $ .querySelector js/document |.app
78+
|persist-storage! $ quote
79+
defn persist-storage! (? e)
80+
.setItem js/localStorage (:storage-key config/site)
81+
format-cirru-edn $ :store @*reel
11782
|reload! $ quote
11883
defn reload! () $ if (nil? build-errors)
11984
do (remove-watch *reel :changes) (clear-cache!)
12085
add-watch *reel :changes $ fn (reel prev) (render-app!)
12186
reset! *reel $ refresh-reel @*reel schema/store updater
12287
hud! "\"ok~" "\"Ok"
12388
hud! "\"error" build-errors
89+
|render-app! $ quote
90+
defn render-app! () $ render! mount-target (comp-container @*reel) dispatch!
91+
|snippets $ quote
92+
defn snippets () $ println config/cdn?
93+
:ns $ quote
94+
ns text-diff.main $ :require
95+
[] respo.core :refer $ [] render! clear-cache! realize-ssr!
96+
[] text-diff.comp.container :refer $ [] comp-container
97+
[] text-diff.updater :refer $ [] updater
98+
[] text-diff.schema :as schema
99+
[] reel.util :refer $ [] listen-devtools!
100+
[] reel.core :refer $ [] reel-updater refresh-reel
101+
reel.schema :as reel-schema
102+
[] text-diff.config :as config
103+
"\"./calcit.build-errors" :default build-errors
104+
"\"bottom-tip" :default hud!
105+
|text-diff.schema $ {}
106+
:defs $ {}
107+
|store $ quote
108+
def store $ {}
109+
:states $ {}
110+
:content |
111+
:ns $ quote (ns text-diff.schema)
112+
|text-diff.updater $ {}
113+
:defs $ {}
114+
|updater $ quote
115+
defn updater (store op op-data op-id op-time)
116+
case-default op
117+
do (println "\"Unknown op:" op) store
118+
:states $ update-states store op-data
119+
:content $ assoc store :content op-data
120+
:hydrate-storage op-data
121+
:ns $ quote
122+
ns text-diff.updater $ :require
123+
[] respo.cursor :refer $ [] update-states

‎index.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
<body>
1515
<div class="app" ></div>
1616

17-
<script type="module" src="./main.js" ></script>
17+
<script type="module" src="./main.mjs" ></script>
1818

1919
</body>
2020

‎main.js‎

Lines changed: 0 additions & 10 deletions
This file was deleted.

‎main.mjs‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
2+
import { main_$x_ } from "./js-out/text-diff.main.mjs"
3+
4+
main_$x_()
5+
6+
if (import.meta.hot) {
7+
import.meta.hot.accept('./js-out/text-diff.main.mjs', (main) => {
8+
main.reload_$x_()
9+
})
10+
}

‎package.json‎

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,21 +3,20 @@
33
"version": "0.1.0",
44
"description": "ClojureScript workflow using Calcit Editor",
55
"main": "index.js",
6-
"scripts": {
7-
},
6+
"scripts": {},
87
"repository": {
98
"type": "git",
109
"url": "git@github.com:mvc-works/calcit-workflow.git"
1110
},
1211
"author": "jiyinyiyong",
1312
"license": "MIT",
1413
"devDependencies": {
15-
"bottom-tip": "^0.1.2",
16-
"vite": "^2.9.13"
14+
"bottom-tip": "^0.1.3",
15+
"vite": "^3.0.9"
1716
},
1817
"dependencies": {
19-
"@calcit/procs": "^0.4.19",
20-
"feather-icons": "^4.24.1",
21-
"shortid": "^2.2.14"
18+
"@calcit/procs": "^0.6.4",
19+
"feather-icons": "^4.29.0",
20+
"shortid": "^2.2.16"
2221
}
2322
}

0 commit comments

Comments
 (0)