webly 0.9 upgrade

Author: awb99

.github/workflows/static.yml

@@ -50,15 +50,16 @@ jobs:
       - name: build gh-pages
         if: success()
         run: |
-          clojure -X:webly:npm-install:viewer
-          clojure -X:webly:release-adv:viewer
-          clojure -X:webly:static:viewer
+          cd static
+          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
+          cp .gorilla/public/rdocument .gorilla/static/r -r
       - name: Upload artifact
         uses: actions/upload-pages-artifact@v3
         with:
-          path: "target/static"
+          path: ".gorilla/static"
       - name: Deploy to GitHub Pages
         id: deployment
         uses: actions/deploy-pages@v4

.gitignore

@@ -26,4 +26,5 @@ rdocument/
 target
 .\#*
 *~
-\#*\#
+\#*\#
+.gorilla

README.md

@@ -9,6 +9,7 @@
 ## DEMO - Get Started
 - clone this repo
 ```
+    cd static
     clj -X:nbeval
     clj -X:webly:npm-install
     clj -X:webly:compile
@@ -23,4 +24,10 @@ is on [Docs Github Pages](https://pink-gorilla.github.io/docs/)
 
 - [demo](https://github.com/pink-gorilla/demo) Please see demo for how to use it.
 - [quanta](https://github.com/clojure-quant/quanta) quantitative backtesting framework
-- [EDGAR](https://github.com/clojure-quant/edgar) visualise mutual fund holdings
+- [EDGAR](https://github.com/clojure-quant/edgar) visualise mutual fund holdings
+
+
+
+
+|                              | org.pinkgorilla/oauth2           | 0.2.32      | 0.2.33      |
+|                              | org.pinkgorilla/reval            | 0.9.177     | 0.10.179    |

build-jar.sh

@@ -5,7 +5,7 @@
    ))
 
 (def lib 'org.pinkgorilla/goldly-docs)
-(def version (format "0.9.%s" (b/git-count-revs nil)))
+(def version (format "0.10.%s" (b/git-count-revs nil)))
 
 (defn jar "build the JAR" [opts]
   (println "Building the JAR")

build.clj

@@ -1,6 +1,6 @@
 #!/bin/sh
 
-rm target -r
+rm .gorilla -r
 rm .shadow-cljs -r
 rm package.json
 rm package-lock.json

build.sh

@@ -1,15 +1,16 @@
 {:paths ["src"
          "resources"
          "target/webly"]
- :deps {org.pinkgorilla/webly {:mvn/version "0.8.714"}
-        org.pinkgorilla/goldly {:mvn/version "0.7.684"}
+ :deps {org.pinkgorilla/webly {:mvn/version "0.9.717"}
+        org.pinkgorilla/goldly {:mvn/version "0.9.686"}
         org.pinkgorilla/pinkie {:mvn/version "0.5.232"}
-        org.pinkgorilla/modular {:mvn/version "0.2.61"}
-        org.pinkgorilla/clj-service {:mvn/version "0.4.21"}
-        org.pinkgorilla/oauth2 {:mvn/version "0.2.32"} ; oauth2 needs to be in docs, because of login-dialogs. rest can be loaded dynamically.
-        org.pinkgorilla/re-flow {:mvn/version "0.1.7"}
-        org.pinkgorilla/dali {:mvn/version "0.1.30"}
-        org.pinkgorilla/reval {:mvn/version "0.9.177"}
+        org.pinkgorilla/modular {:mvn/version "0.2.67"}
+        org.pinkgorilla/clj-service {:mvn/version "0.4.23"}
+        org.pinkgorilla/oauth2 {:mvn/version "0.2.33"} ; oauth2 needs to be in docs, because of login-dialogs. rest can be loaded dynamically.
+        ;org.pinkgorilla/re-flow {:mvn/version "0.1.7"}
+        org.pinkgorilla/flowy {:mvn/version "0.1.28"}
+        org.pinkgorilla/dali {:mvn/version "0.2.31"}
+        org.pinkgorilla/reval {:mvn/version "0.10.179"}
         ;org.pinkgorilla/devtools {:mvn/version "0.0.18"}
         ;org.pinkgorilla/ui-binaryclock {:mvn/version "0.2.20"} ; binaryclock is useful for testing. 
         ;; "ui design in general"
@@ -26,18 +27,18 @@
         ;; "tables"
         org.pinkgorilla/ui-pprint-frisk {:mvn/version "0.6.565"} ; this is only frisk
         ;org.pinkgorilla/ui-reacttable {:mvn/version "0.0.6"} ; pinkie problem
-        org.pinkgorilla/reagent-table {:mvn/version "0.3.88"}; ag-grid, cheetah-grid, highcharts, vega and tml-ds-cljs
+        org.pinkgorilla/dali-table {:mvn/version "0.3.91"} ; ag-grid, cheetah-grid, highcharts, vega and tml-ds-cljs
         org.pinkgorilla/options {:mvn/version "0.0.16"}
         ; "charts"
-        org.pinkgorilla/ui-cytoscape {:mvn/version "0.1.10"}
-        org.pinkgorilla/ui-leaflet {:mvn/version "0.1.23"}
+        org.pinkgorilla/ui-cytoscape {:mvn/version "0.1.11"}
+        ;org.pinkgorilla/ui-leaflet {:mvn/version "0.1.23"}
         org.pinkgorilla/ui-sparklines {:mvn/version "0.2.7"}
         org.pinkgorilla/ui-video {:mvn/version "0.2.10"} ; react-player clojure-compiler issue, youtube-player ok
-
+        
         ;org.pinkgorilla/ui-math {:mvn/version "0.0.7"}
         ; non lazy deps
         ;org.pinkgorilla/ui-quil  {:mvn/version "0.1.7"} ; not bundeled (too big)
-
+        
         ; run by default in docs-services
         nrepl/nrepl {:mvn/version "1.2.0"}
         cider/cider-nrepl {:mvn/version "0.49.1"}}
@@ -50,7 +51,7 @@
           :jvm-opts ["-Dmaven.wagon.rto=90000"]}
 
 ; demo ui
-  :webly {:exec-fn webly.app.app/webly-build
+  :webly {:exec-fn webly.spa/webly-build
           :exec-args {:config ["docs/docs-config.edn"]
                       :profile "npm-install"}}
 
@@ -65,17 +66,5 @@
         :exec-args {:profile "jetty"
                     :config  ["docs/docs-config.edn"]
                     :services "docs/docs-services.edn"}}
-
-  :viewer {:extra-paths ["static"]}
-
-  :nbeval {:exec-fn modular.system/start!
-           :exec-args {:run demo.task/eval-all
-                       :config  ["docs/docs-config.edn"]
-                       :services "docs/task-services.edn"}}
-  
-  ;; debugging
-  
-  :show-public {:exec-fn public-res/show-public
-                :extra-paths ["dev"]}
-  
+ 
   }}

deps.edn

@@ -4,13 +4,13 @@
                           [#{"*"} :info]]
               :appenders {:default {:type :console-color}
                           :file {:type :file
-                                 :fname "target/file.log"}
+                                 :fname ".gorilla/file.log"}
                           :rolling {:type :file-rolling
-                                    :path "target/rolling.log"
+                                    :path ".gorilla/rolling.log"
                                     :pattern :monthly}
                           :workflow {:type :file-rolling-context
                                      :context :scheduled-data-import
-                                     :path "target/workflow.log"
+                                     :path ".gorilla/workflow.log"
                                      :pattern :monthly}}}
 
  :timbre/cljs {:min-level [[#{"pinkgorilla.nrepl.*"} :warn]
@@ -20,7 +20,7 @@
 
  :scratchpad {:tap true}
 
- :reval {:rdocument  {:fpath "target/webly/public/rdocument"
+ :reval {:rdocument  {:fpath ".gorilla/public/rdocument"
                       :rpath "/r/rdocument"}
          :collections {:demo {:clj "demo/notebook/" ; embedded notebooks in jars.
                               :cljs "demo/notebook/"}}}

dev/public_res.clj

@@ -4,10 +4,11 @@
  {; the print services can be comment out. Just useful for testing.
   :print-modular-env {:start (println "modular environment: " #ref [:modular])}
 
-  :config {:start (modular.config/load-config! (:config #ref [:modular]))}
+  :config1 {:start (modular.config/load-config! (:config #ref [:modular]))}
+  :config {:start (deref (clip/ref :config1))}
 
   :timbre {:start (modular.log/timbre-config!
-                   (:timbre/clj (deref (clip/ref :config))))}
+                   (:timbre/clj (clip/ref :config)))}
 
   :exts {:start (extension/discover)}
 
@@ -21,13 +22,22 @@
   :reval {:start (reval.core/start-reval
                   (merge {:clj  (clip/ref :clj-service)
                           :reval-role nil}
-                         (:reval (deref (clip/ref :config)))))}
-
-  :webly {:start (webly.app.app/start-webly
-                  (clip/ref :exts)
-                  (deref (clip/ref :config))
+                         (:reval (clip/ref :config))))}
+
+  :exec {:start (flowy.executor/start-executor
+                 {:env {}
+                  :exts (clip/ref :exts)}
+                 (:services (clip/ref :config)))}
+  
+  :flowy {:start (flowy.reflower/start-reflower (clip/ref :exec))}
+     
+  :webly {:start (webly.spa/start-webly
+                  {:exts (clip/ref :exts)
+                   :ctx {:flowy (clip/ref :flowy)}}
+                  (clip/ref :config)
                   (:profile #ref [:modular]))
-          :stop (webly.app.app/stop-webly this)}
+          :stop (webly.spa/stop-webly this)}
+  
 
   :nrepl {;:pre-start (spit ".nrepl-port" (str 9100))
           :start (nrepl.server/start-server

resources/docs/docs-config.edn

@@ -0,0 +1,24 @@
+{:paths ["src" "resources"]
+ :deps {org.pinkgorilla/docs {:local/root ".." :deps/manifest :deps}}
+
+ :aliases {; notebook eval
+           :nbeval {:exec-fn modular.system/start!
+                    :exec-args {:run demo.task/eval-all
+                                :config  ["docs/docs-config.edn"]
+                                :services "docs/task-services.edn"}}
+           ; demo ui
+           :webly {:exec-fn webly.spa/webly-build
+                   :exec-args {:config ["docs/docs-config.edn"]
+                               :profile "npm-install"}}
+
+           :npm-install {:exec-args {:profile "npm-install"}}
+           :compile {:exec-args {:profile "compile"}}
+           :release {:exec-args {:profile "release"}}
+           :release-adv {:exec-args {:profile "release-adv"}}
+           :static {:exec-args {:profile "static"}}
+           :ci {:exec-args {:profile "ci"}}
+
+           :run {:exec-fn modular.system/start!
+                 :exec-args {:profile "jetty"
+                             :config  ["docs/docs-config.edn"]
+                             :services "docs/docs-services.edn"}}}}

resources/docs/docs-services.edn

@@ -1,11 +1,11 @@
 #!/bin/sh
 
-rm target -r
+rm .gorilla -r
 rm .shadow-cljs -r
 
 clojure -X:webly:npm-install
 clojure -X:webly:compile
 # clojure -X:webly:release-adv
 clojure -X:webly:static
 clojure -X:nbeval
-cp target/webly/public/rdocument target/static/r -r
+# cp target/webly/public/rdocument target/static/r -r