Fix image; upgrade deps

.github/workflows/upload.yaml

@@ -1,4 +1,3 @@
-
 name: Upload Assets
 
 on:
@@ -13,26 +12,16 @@ jobs:
     steps:
       - uses: actions/checkout@v4
 
-      - uses: actions/setup-node@v3
+      - uses: actions/setup-node@v4
         with:
           node-version: 20
-          cache: 'yarn'
-
-      - uses: supplypike/setup-bin@v3
-        with:
-          uri: 'https://github.com/calcit-lang/calcit/releases/download/0.8.14/cr'
-          name: 'cr'
-          version: '0.8.14'
+          cache: "yarn"
 
-      - uses: supplypike/setup-bin@v3
-        with:
-          uri: 'https://github.com/calcit-lang/calcit/releases/download/0.8.14/caps'
-          name: 'caps'
-          version: '0.8.14'
+      - uses: calcit-lang/[email protected]
 
       - name: "compiles to js"
         run: >
-          caps --ci && cr --emit-js --once
+          caps --ci && cr -1 js
           && yarn && yarn vite build --base=./ && yarn ssr
 
       - name: Deploy to server
@@ -41,11 +30,11 @@ jobs:
         env:
           DEPLOY_KEY: ${{secrets.rsync_private_key}}
         with:
-          flags: '-avzr --progress'
-          options: ''
-          ssh_options: ''
-          src: 'dist/*'
-          dest: '[email protected]:/web-assets/repo/${{ github.repository }}'
+          flags: "-avzr --progress"
+          options: ""
+          ssh_options: ""
+          src: "dist/*"
+          dest: "[email protected]:/web-assets/repo/${{ github.repository }}"
 
       - name: Display status from deploy
         run: echo "${{ steps.deploy.outputs.status }}"

.gitignore

@@ -7,3 +7,5 @@ ssr-out/
 node_modules/
 dist/
 *.zip
+
+.DS_Store

calcit.cirru

@@ -723,25 +723,6 @@
                         :data $ {}
                           |T $ %{} :Leaf (:at 1583948960708) (:by |rJG4IHzWf) (:text |:link)
                           |j $ %{} :Leaf (:at 1583948960708) (:by |rJG4IHzWf) (:text "|\"https://repo.tiye.me/mvc-works/edn-formatter/")
-                  |d $ %{} :Expr (:at 1583948960708) (:by |rJG4IHzWf)
-                    :data $ {}
-                      |T $ %{} :Leaf (:at 1583948960708) (:by |rJG4IHzWf) (:text |{})
-                      |j $ %{} :Expr (:at 1583948960708) (:by |rJG4IHzWf)
-                        :data $ {}
-                          |T $ %{} :Leaf (:at 1583948960708) (:by |rJG4IHzWf) (:text |:name)
-                          |j $ %{} :Leaf (:at 1668768486415) (:by |rJG4IHzWf) (:text "|\"Mudder")
-                      |r $ %{} :Expr (:at 1583948960708) (:by |rJG4IHzWf)
-                        :data $ {}
-                          |T $ %{} :Leaf (:at 1583948960708) (:by |rJG4IHzWf) (:text |:key)
-                          |j $ %{} :Leaf (:at 1668768490603) (:by |rJG4IHzWf) (:text |:mudder)
-                      |v $ %{} :Expr (:at 1583948960708) (:by |rJG4IHzWf)
-                        :data $ {}
-                          |T $ %{} :Leaf (:at 1583948960708) (:by |rJG4IHzWf) (:text |:icon)
-                          |j $ %{} :Leaf (:at 1668768515507) (:by |rJG4IHzWf) (:text |nil)
-                      |x $ %{} :Expr (:at 1583948960708) (:by |rJG4IHzWf)
-                        :data $ {}
-                          |T $ %{} :Leaf (:at 1583948960708) (:by |rJG4IHzWf) (:text |:link)
-                          |j $ %{} :Leaf (:at 1668768505217) (:by |rJG4IHzWf) (:text "|\"https://r.tiye.me/worktools/mudder/")
                   |j $ %{} :Expr (:at 1536070994799) (:by |rJG4IHzWf)
                     :data $ {}
                       |T $ %{} :Leaf (:at 1536070995461) (:by |rJG4IHzWf) (:text |{})

compact.cirru

@@ -112,7 +112,6 @@
             def quick-apps $ []
               {} (:name "\"Tiye Index") (:key :edn-formatter) (:icon nil) (:link "\"https://fx.nioint.com/pages/tiye-index/")
               {} (:name "\"EDN Formatter") (:key :edn-formatter) (:icon "\"edn-formatter.png") (:link "\"https://repo.tiye.me/mvc-works/edn-formatter/")
-              {} (:name "\"Mudder") (:key :mudder) (:icon nil) (:link "\"https://r.tiye.me/worktools/mudder/")
               {} (:name "\"Copyboard") (:key :copyboard) (:icon "\"copyboard.png") (:link "\"http://cp.topix.im")
               {} (:name "\"Diff view") (:key :diffview) (:icon "\"diffview.png") (:link "\"http://r.tiye.me/Memkits/diffview/")
               {} (:name "\"Timegrass") (:key :timegrass) (:icon "\"timegrass.png") (:link "\"http://timegrass.topix.im/")

package.cirru → deps.cirru

@@ -1,9 +1,10 @@
 
 {}
+  :calcit-version |0.9.6
   :dependencies $ {}
     |calcit-lang/lilac |main
     |calcit-lang/memof |main
-    |Respo/respo.calcit |0.16.3
+    |Respo/respo.calcit |0.16.12
     |Respo/reel.calcit |main
     |Respo/respo-markdown.calcit |main
     |Respo/respo-ui.calcit |main

package.json

@@ -4,14 +4,14 @@
   "description": "ClojureScript workflow using Calcit Editor",
   "main": "index.js",
   "scripts": {
-    "watch-ssr": "cr --entry ssr --emit-path ssr-out/ --emit-js",
-    "compile-ssr": "cr --entry ssr --emit-path ssr-out/ --emit-js -1",
+    "watch-ssr": "cr --entry ssr --emit-path ssr-out/ js",
+    "compile-ssr": "cr --entry ssr --emit-path ssr-out/ js -1",
     "ssr": "yarn compile-ssr && node ssr.mjs",
     "get-fonts": "cd dist && wget --recursive http://cdn.tiye.me/favored-fonts/main-fonts.css -q --show-progress",
     "get-logos": "cd dist && wget --recursive wget -r http://cdn.tiye.me/logo/ --no-parent -q --show-progress",
     "get2": "yarn get-fonts && yarn get-logos",
     "cp": "cp entry/manifest.json dist && cp entry/neu.png dist",
-    "build": "cr --emit-js -1 && vite build --base=./",
+    "build": "cr js -1 && vite build --base=./",
     "crx": "yarn build && yarn cp-resources && zip -r neu-tab.zip dist/"
   },
   "repository": {
@@ -24,7 +24,7 @@
     "vite": "^5.2.14"
   },
   "dependencies": {
-    "@calcit/procs": "^0.8.16",
-    "dayjs": "^1.11.10"
+    "@calcit/procs": "^0.9.6",
+    "dayjs": "^1.11.13"
   }
 }