build changed

.github/workflows/ci.yml

@@ -7,45 +7,45 @@ on:
 
 jobs:
   build:
-
     runs-on: ubuntu-latest
-
     steps:
-    - uses: actions/checkout@v2
+    - name: Checkout
+      uses: actions/checkout@v2
+      with:
+        fetch-depth: 0
     - name: Use Node.js 12.x
       uses: actions/setup-node@v1
       with:
         node-version: 12.x
-    - name: Cache Maven dependencies
-      uses: actions/cache@v1
+    - name: Prepare java
+      uses: actions/setup-java@v1
       with:
-        path: ~/.m2/repository
-        key: ${{ runner.os }}-maven-${{ hashFiles('**/project.clj') }}
-        restore-keys: |
-          ${{ runner.os }}-maven-
-    - name: Cache NPM dependencies
-      uses: actions/cache@v1
+        java-version: 1.14
+    - name: Install clojure tools
+      uses: DeLaGuardo/setup-clojure@3.5
       with:
-        path: ~/.npm
-        key: ${{ runner.os }}-node-${{ hashFiles('**/package-lock.json') }}
-        restore-keys: |
-          ${{ runner.os }}-node-
+        cli: 1.10.3.912 # Clojure CLI based on tools.deps
+    - name: clj-fmt
+      if: ${{ matrix.os != 'windows-latest' }}
+      run: clojure -M:cljfmt
+      shell: bash
     - name: Install dependencies
       run: |
-        lein npm-install
-        lein deps
-    - name: Check formatting
-      run: lein cljfmt check
-    - name: Run tests
-      run: |
-        lein test
-        lein build-shadow-ci
-        npm test
+        clojure -X:webly:npm-install
+        ./scripts/copy_res.sh
+    #- name: clj-kondo
+    #  run: clojure -M:lint
+    #- name: test-clj
+    #  run: clojure -M:test-clj
     - name: Release
+      if: success()
+      # if: github.event_name == 'push'
       env:
-        RELEASE_USERNAME: ${{ secrets.ReleaseUsername }}
-        RELEASE_PASSWORD: ${{ secrets.ReleasePassword }}
+        CLOJARS_USERNAME: ${{ secrets.ReleaseUsername }}
+        CLOJARS_PASSWORD: ${{ secrets.ReleasePassword }}
+        CODECOV_TOKEN: ${{ secrets.CodecovToken }}
       run: |
         git config --global user.email "ci@pinkgorilla.org"
         git config --global user.name "CI/CD"
-        lein release
+        clojure -T:build jar
+        clojure -T:build deploy

build.clj

@@ -0,0 +1,50 @@
+(ns build
+  (:require
+   [babashka.fs :as fs]
+   [clojure.tools.build.api :as b]
+   [deps-deploy.deps-deploy :as dd]))
+
+(def lib 'org.pinkgorilla/pinkie)
+(def version (format "0.5.%s" (b/git-count-revs nil)))
+(def class-dir "target/classes")
+(def basis (b/create-basis {:project "deps.edn"}))
+(def jar-file (format "target/%s-%s.jar" (name lib) version))
+
+(defn clean [_]
+  (b/delete {:path "target"}))
+
+(def pom-template
+  [[:licenses
+    [:license
+     [:name "Eclipse Public License"]
+     [:url "https://www.eclipse.org/legal/epl-v10.html"]]]
+   [:developers
+    [:developer
+     [:name "pink-gorilla"]]]
+   [:scm
+    [:url "https://github.com/pink-gorilla/pinkie/"]
+    [:connection "scm:git:git://github.com/pink-gorilla/pinkie.git"]
+    [:developerConnection "scm:git:ssh://git@github.com/pink-gorilla/pinkie.git"]]])
+
+(def opts {:class-dir class-dir
+           :lib lib
+           :version version
+           :basis basis
+           :pom-data pom-template
+           :src-dirs ["src"]})
+
+(defn jar [_]
+  (b/write-pom opts)
+  (b/copy-dir {:src-dirs ["src"
+                          "resources"]
+               :target-dir class-dir})
+  (b/jar {:class-dir class-dir
+          :jar-file jar-file}))
+
+(defn deploy "Deploy the JAR to Clojars." [_]
+  (println "Deploying to Clojars..")
+  (dd/deploy {:installer :remote
+              ;:sign-releases? true
+              :pom-file (b/pom-path (select-keys opts [:lib :class-dir]))
+              ;:artifact "target/tech.ml.dataset.jar"
+              :artifact (b/resolve-path jar-file)}))

deps.edn

@@ -17,17 +17,31 @@
                      "--config" "cljkondo.edn"
                      "--lint"]}
 
-  :outdated {:extra-deps {com.github.liquidz/antq {:mvn/version "RELEASE"}}
-             :main-opts ["-m" "antq.core"]}
+  :build {:deps {io.github.clojure/tools.build {:mvn/version "0.9.6"}
+                 slipset/deps-deploy {:mvn/version "0.2.1"}
+                 babashka/fs {:mvn/version "0.0.5"}}
+          :ns-default build}
 
-  :build {:extra-deps {org.pinkgorilla/webly {:mvn/version "0.4.602"}
-                       com.fasterxml.jackson.core/jackson-core {:mvn/version "2.12.0"}}
-          :extra-paths ["profiles/demo/src" "profiles/demo/resources"]
+  :webly {:extra-deps {org.pinkgorilla/webly {:mvn/version "0.5.655"}}
           :exec-fn webly.app.app/webly-build
-          :exec-args {:config ["webly/config.edn" "demo.edn"]
+          :exec-args {:config [{: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"}}}]
                       :profile "npm-install"}}
 
-  :demo {:extra-deps {org.pinkgorilla/webly {:mvn/version "0.4.602"}
+  :npm-install {:exec-args {:profile "npm-install"}}
+  :compile {:exec-args {:profile "compile2"}}
+  :release {:exec-args {:profile "release"}}
+  :release-adv {:exec-args {:profile "release-adv"}}
+  :static {:exec-args {:profile "static"}}
+  :ci {:exec-args {:profile "ci"}}
+
+  :demo {:extra-deps {org.pinkgorilla/webly {:mvn/version "0.5.655"}
                       com.fasterxml.jackson.core/jackson-core {:mvn/version "2.12.0"}}
          :extra-paths ["profiles/demo/src" "profiles/demo/resources"]
          :exec-fn modular.system/start!

resources/ext/pinkie.edn

@@ -1,21 +1,15 @@
 {:name "pinkie"
  ; build
  :lazy false
- :cljs-namespace [; ui.pinkie 
-                  pinkie.error
-                  pinkie.text
-                  pinkie.html
-                  pinkie.jsrender
-                  pinkie.throw-exception
-                  ; pinkie
-                  pinkie.default-setup
-                  pinkie.pinkie]
- :cljs-ns-bindings {'pinkie {'register-tag pinkie.pinkie/register-tag
-                             'tags pinkie.pinkie/tags
-                             'render pinkie.pinkie-render/pinkie-render}
-                    'ui.pinkie {'error-boundary pinkie.error/error-boundary
-                                'text pinkie.text/text
-                                'html pinkie.html/html
-                                'js-fun pinkie.jsrender/render-js
-                                'throw-ex pinkie.throw-exception/exception-component}}}
+ :cljs-namespace [pinkie.ui.core
+                  pinkie.tag
+                  pinkie.tag.pinkie-render]
+ :cljs-ns-bindings {'pinkie.tag {'register-tag pinkie.tag/register-tag
+                                 'tags pinkie.tag/tags}
+                    'pinkie.tag.pinkie-render {'pinkie-render pinkie.pinkie-render/pinkie-render}
+                    'pinkie.ui.core {'error-boundary pinkie.ui.core/error-boundary
+                                'text pinkie.ui.core/text
+                                'html pinkie.ui.core/html
+                                'render-js pinkie.ui.core/render-js
+                                'gtable pinkie.ui.core/gtable}}}
 

resources/ext/viz.edn

@@ -1,9 +1,8 @@
-{:name "viz-pinkie"
+{:name "pinkie-viz"
  ; build
  :lazy false
- :cljs-namespace [viz.hiccup
-                  viz.show]
- :cljs-ns-bindings {'viz {'show viz.show/show}
-                    'viz.hiccup {'resolve-hiccup viz.hiccup/resolve-hiccup}
-                    'viz.show {'show viz.show/show}
-                    }}
+ :cljs-namespace [viz.core]
+ :cljs-ns-bindings {'viz.core {'show viz.core/show
+                               'resolve-hiccup viz.core/resolve-hiccup
+                               'resolve-fn viz.core/resole-fn
+                               'no-renderer viz.unknown/no-renderer}}}

src/pinkie/default_setup.cljs

@@ -1,11 +1,7 @@
 (ns pinkie.default-setup
   (:require
-   [pinkie.pinkie] ; tag injection
-   [pinkie.pinkie-render] ; create atom state from clojure
+   [pinkie.tag] ; tag injection
+   [pinkie.tag.pinkie-render] ; create atom state from clojure
 
-   ; reagent components
-   [pinkie.html] ; html with script injection
-   [pinkie.jsrender] ; module loader 
-   [pinkie.text] ; text with newline
-   [pinkie.gtable] ; table (legacy gorilla compatibility)
+
    ))

src/pinkie/pinkie.cljc → src/pinkie/tag.cljc

@@ -1,4 +1,4 @@
-(ns pinkie.pinkie
+(ns pinkie.tag
   (:require
    [clojure.string :as str]
    [clojure.walk :refer [prewalk postwalk]] ; cljs 1.10 still does not have walk fixed

src/pinkie/htmltags.cljs → src/pinkie/tag/htmltags.cljs

@@ -1,4 +1,4 @@
-(ns pinkie.htmltags)
+(ns pinkie.tag.htmltags)
 
 (def html5-tags
   #{:<>   ; this is technically the reagent-ignore keyword

src/pinkie/macros.cljc → src/pinkie/tag/macros.cljc

@@ -1,4 +1,4 @@
-(ns pinkie.macros)
+(ns pinkie.tag.macros)
 
 (defmacro def-
   "same as def, yielding non-public def"