From 4f15324661c8e4bd63df74d094b5ff412a9dbc19 Mon Sep 17 00:00:00 2001
From: awb99 <awb99@gmail.com>
Date: Sun, 14 Apr 2024 18:36:35 -0500
Subject: [PATCH] ci improved

---
 .github/workflows/static.yml         |  7 +------
 demo/deps.edn                        |  2 +-
 demo/resources/reval/demo-config.edn | 11 +++--------
 reval-ui/build.clj                   |  2 +-
 reval-ui/deps.edn                    |  4 ++--
 reval/deps.edn                       |  1 -
 reval/src/reval/type/ui/unknown.cljc |  0
 static.sh                            | 14 ++++++++++++++
 8 files changed, 22 insertions(+), 19 deletions(-)
 delete mode 100644 reval/src/reval/type/ui/unknown.cljc
 create mode 100755 static.sh

diff --git a/.github/workflows/static.yml b/.github/workflows/static.yml
index 7a3c89c..61f2508 100644
--- a/.github/workflows/static.yml
+++ b/.github/workflows/static.yml
@@ -50,12 +50,7 @@ jobs:
       - name: build gh-pages
         if: success()
         run: |
-          cd demo
-          clojure -X:webly:npm-install
-          clojure -X:webly:release-adv
-          clojure -X:webly:static
-          clojure -X:nbeval
-          cp target/webly/public/rdocument target/static/r -r
+          ./static.sh
       - name: Upload artifact
         uses: actions/upload-pages-artifact@v3
         with:
diff --git a/demo/deps.edn b/demo/deps.edn
index 5c429fc..82e28d7 100644
--- a/demo/deps.edn
+++ b/demo/deps.edn
@@ -2,7 +2,7 @@
  :deps
  {org.pinkgorilla/reval {:local/root "../reval" :deps/manifest :deps}
   org.pinkgorilla/reval-ui {:local/root "../reval-ui" :deps/manifest :deps}
-  org.pinkgorilla/webly {:mvn/version "0.5.661"}
+  org.pinkgorilla/webly {:mvn/version "0.5.662"}
   ; ui modules for demo notebooks:
   org.pinkgorilla/ui-highcharts {:mvn/version "0.0.28"}
   }
diff --git a/demo/resources/reval/demo-config.edn b/demo/resources/reval/demo-config.edn
index 201c055..12c9779 100644
--- a/demo/resources/reval/demo-config.edn
+++ b/demo/resources/reval/demo-config.edn
@@ -1,11 +1,6 @@
-{:build {:disabled-extensions #{; extensions using sci-configs will not work in webly.
-                                "reagent" "re-frame"
-                                "funcool-promesa"
-                                "applied-science.js-interop"
-                                ; webly2 is now in webly. needs to be removed from ui-repl.
-                                "webly2"
-                                "ui-repl"
-                                "cljs-ajax"
+{:build {:disabled-extensions #{
+                                ;"webly2"
+                                ;"cljs-ajax"
                                 }}
  
  :reval {:rdocument  {:storage-root "target/webly/public/rdocument/"
diff --git a/reval-ui/build.clj b/reval-ui/build.clj
index b90841e..a8802e4 100644
--- a/reval-ui/build.clj
+++ b/reval-ui/build.clj
@@ -5,7 +5,7 @@
    [clojure.string :as str]
    [clojure.tools.build.api :as b]
    [org.corfield.build :as bb] ; https://github.com/seancorfield/build-clj
-   [modular.date :refer [now-str]]))
+   ))
 
 (def lib 'org.pinkgorilla/reval)
 (def version (format "0.6.%s" (b/git-count-revs nil)))
diff --git a/reval-ui/deps.edn b/reval-ui/deps.edn
index 3df61f5..663cc2d 100644
--- a/reval-ui/deps.edn
+++ b/reval-ui/deps.edn
@@ -3,8 +3,8 @@
  :deps
  {org.pinkgorilla/reval {:local/root "../reval" :deps/manifest :deps}
   ; deps to ui extensions used in reval
-  org.pinkgorilla/pinkie {:mvn/version "0.5.231"}; error boundary
-  org.pinkgorilla/ui-repl {:mvn/version "0.1.96"} ; reagent
+  org.pinkgorilla/pinkie {:mvn/version "0.5.231"} ; error boundary
+  org.pinkgorilla/ui-repl {:mvn/version "0.1.98"} ; reagent
   org.pinkgorilla/ui-input {:mvn/version "0.2.44"} ; spaces
   org.pinkgorilla/ui-codemirror {:mvn/version "0.1.48"}
   org.pinkgorilla/ui-highlightjs {:mvn/version "0.0.9"}
diff --git a/reval/deps.edn b/reval/deps.edn
index 2c1d2c6..7b56040 100644
--- a/reval/deps.edn
+++ b/reval/deps.edn
@@ -1,7 +1,6 @@
 {:paths ["src"]
  :deps
  {org.clojure/clojure    {:mvn/version "1.11.1"}
-  org.clojure/core.async {:mvn/version "1.6.673"}
   org.clojure/data.codec {:mvn/version "0.1.1"} ; image base64 encoding
   rewrite-clj/rewrite-clj {:mvn/version "1.1.47"}
   org.pinkgorilla/modular {:mvn/version "0.0.40"}
diff --git a/reval/src/reval/type/ui/unknown.cljc b/reval/src/reval/type/ui/unknown.cljc
deleted file mode 100644
index e69de29..0000000
diff --git a/static.sh b/static.sh
new file mode 100755
index 0000000..6e54687
--- /dev/null
+++ b/static.sh
@@ -0,0 +1,14 @@
+ #!/bin/sh
+cd demo
+rm target -r
+rm .shadow-cljs -r
+rm .cpcache -r
+rm package.json
+rm package-lock.json
+rm shadow-cljs.edn
+rm karma.conf.js
+clojure -X:webly:npm-install
+clojure -X:webly:release-adv
+clojure -X:webly:static
+clojure -X:nbeval
+cp target/webly/public/rdocument target/static/r -r
\ No newline at end of file