workflow update; use official inline API

.gitattributes

@@ -1,3 +1,3 @@
 
 calcit.edn -diff linguist-generated
-yarn.lock -diff
+yarn.lock -diff linguist-generated

cli/build/main.clj

@@ -7,13 +7,11 @@
   (println command)
   (println (:out (sh "bash" "-c" command))))
 
-(defn watch []
-  (shadow/watch :client))
-
 (defn build-cdn []
   (sh! "rm -rf dist/*")
   (shadow/release :client)
   (shadow/compile :page)
+  (shadow/compile :upload)
   (sh! "release=true cdn=true node target/page.js")
   (sh! "cp entry/manifest.json dist/"))
 

package.json

@@ -6,11 +6,11 @@
   "scripts": {
     "watch": "shadow-cljs watch client",
     "serve": "http-server dist -s",
-    "repl": "rlwrap shadow-cljs clj-repl",
     "build-cdn": "shadow-cljs clj-run build.main/build-cdn",
     "page": "shadow-cljs clj-run build.main/page",
     "build": "shadow-cljs clj-run build.main/build",
-    "upload": "lumo -c cli/:src/ -m build.upload",
+    "upload": "node target/upload.js",
+    "ln": "cd target && rm -f entry && ln -s ../entry",
     "up": "yarn build-cdn && yarn upload"
   },
   "repository": {
@@ -26,6 +26,7 @@
   "dependencies": {
     "escape-html": "^1.0.3",
     "highlight.js": "^9.15.6",
+    "feather-icons": "^4.21.0",
     "shortid": "^2.2.14"
   }
 }

shadow-cljs.edn

@@ -1,5 +1,5 @@
 
-{:source-paths ["src" "cli"]
+{:source-paths ["src" "content" "cli"]
  :cache-blockers #{cumulo-util.build}
  :dependencies [[mvc-works/hsl          "0.1.2"]
                 [mvc-works/shell-page   "0.1.10"]

src/app/comp/container.cljs

@@ -11,7 +11,7 @@
             [app.config :refer [dev?]]
             [app.util :refer [highlighter]]
             [app.comp.showcase :refer [comp-showcase]]
-            [build.util :refer [inline-resource]]))
+            [shadow.resource :refer [inline]]))
 
 (defcomp
  comp-footer
@@ -54,7 +54,7 @@
  ()
  (div
   {:style {:max-width 800, :margin :auto, :padding 16}}
-  (comp-md-block (inline-resource "content/resource.md") {:class-name "content"})))
+  (comp-md-block (inline "resource.md") {:class-name "content"})))
 
 (defcomp
  comp-tool-card
@@ -93,7 +93,7 @@
  ()
  (div
   {:style {:max-width 800, :margin :auto, :padding 16}}
-  (comp-md-block (inline-resource "content/quote.md") {:class-name "content"})
+  (comp-md-block (inline "quote.md") {:class-name "content"})
   (div
    {:style {:margin-top 48}}
    (<>
@@ -114,7 +114,7 @@
      :href "http://clojurescript.io/",
      :target "_blank"}
     (<> "Get an online REPL")))
-  (comp-md-block (inline-resource "content/learning.md") {:class-name "content"})
+  (comp-md-block (inline "learning.md") {:class-name "content"})
   (div
    {:style (merge {:width :auto})}
    (comp-tool-card
@@ -146,9 +146,7 @@
                :text-align :center,
                :max-width 800,
                :padding "0 16px"}}
-      (comp-md-block
-       (inline-resource "content/clojure-is.md")
-       {:class-name "content on-dark"}))
+      (comp-md-block (inline "clojure-is.md") {:class-name "content on-dark"}))
      (comp-showcase (:case-idx store)))
     (=< nil 32)
     (comp-tools)

src/app/comp/showcase.cljs

@@ -9,39 +9,37 @@
             [respo-md.comp.md :refer [comp-md comp-md-block]]
             [app.config :refer [dev?]]
             [app.util :refer [highlighter]]
-            [build.util :refer [inline-resource]]))
+            [shadow.resource :refer [inline]]))
 
 (def showcases
-  {0 {:code (inline-resource "content/thread-macro.cljs"),
+  {0 {:code (inline "thread-macro.cljs"),
       :text "Thread macros",
       :url "https://clojure.org/guides/threading_macros"},
-   1 {:code (inline-resource "content/destructuring.cljs"),
+   1 {:code (inline "destructuring.cljs"),
       :text "Destructuring",
       :url "https://gist.github.com/john2x/e1dca953548bfdfb9844"},
-   2 {:code (inline-resource "content/inter-op.cljs"),
+   2 {:code (inline "inter-op.cljs"),
       :text "InterOp",
       :url "http://www.spacjer.com/blog/2014/09/12/clojurescript-javascript-interop/"},
-   3 {:code (inline-resource "content/transducer.cljs"),
+   3 {:code (inline "transducer.cljs"),
       :text "Transducers",
       :url "https://stackoverflow.com/a/26322910/883571"},
-   4 {:code (inline-resource "content/reagent.cljs"),
+   4 {:code (inline "reagent.cljs"),
       :text "Reagent",
       :url "http://reagent-project.github.io/"},
-   5 {:code (inline-resource "content/js-deps.cljs"),
+   5 {:code (inline "js-deps.cljs"),
       :text "JS Dependencies",
       :url "https://code.thheller.com/blog/shadow-cljs/2017/11/10/js-dependencies-in-practice.html"},
-   6 {:code (inline-resource "content/nodejs.cljs"),
+   6 {:code (inline "nodejs.cljs"),
       :text "Node.js Server",
       :url "https://gist.github.com/semperos/83696c0ac168eb03ab1d"},
-   7 {:code (inline-resource "content/data.cljs"),
+   7 {:code (inline "data.cljs"),
       :text "Data manipulation",
       :url "https://stackoverflow.com/a/38754874/883571"},
-   8 {:code (inline-resource "content/atom.cljs"),
+   8 {:code (inline "atom.cljs"),
       :text "Atom",
       :url "https://clojuredocs.org/clojure.core/atom"},
-   9 {:code (inline-resource "content/edn.cljs"),
-      :text "EDN",
-      :url "https://learnxinyminutes.com/docs/edn/"}})
+   9 {:code (inline "edn.cljs"), :text "EDN", :url "https://learnxinyminutes.com/docs/edn/"}})
 
 (defcomp
  comp-showcase

src/app/upload.cljs

@@ -0,0 +1,12 @@
+
+(ns app.upload
+  (:require ["child_process" :as cp] [app.config :as config] [cumulo-util.file :refer [sh!]])
+  (:require-macros [clojure.core.strint :refer [<<]]))
+
+(defn main! []
+  (sh! (<< "rsync -avr --progress dist/* ~(:cdn-folder config/site)"))
+  (sh!
+   (<<
+    "rsync -avr --progress dist/{index.html,manifest.json} ~(:upload-folder config/site)")))
+
+(defn reload! [] )