Merge pull request #7 from mvc-works/reset-workflow

resetting to new calcit-lang workflow

Author: soyaine

.gitattributes

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

.github/workflows/upload.yaml

@@ -0,0 +1,67 @@
+name: Upload
+
+on:
+  push:
+    branches:
+      - master
+      - main
+  pull_request: {}
+
+jobs:
+  test:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v2
+
+    - name: Get yarn cache
+      id: yarn-cache
+      run: echo "::set-output name=dir::$(yarn cache dir)"
+
+    - uses: actions/cache@v2
+      name: Cache node modules of yarn
+      with:
+        path: ${{ steps.yarn-cache.outputs.dir }}
+        key: ${{ runner.os }}-yarn-${{ hashFiles('yarn.lock') }}
+        restore-keys: |
+          ${{ runner.os }}-yarn-
+
+    - name: ACTIONS_ALLOW_UNSECURE_COMMANDS
+      id: ACTIONS_ALLOW_UNSECURE_COMMANDS
+      run: echo 'ACTIONS_ALLOW_UNSECURE_COMMANDS=true' >> $GITHUB_ENV
+
+    - name: add cr
+      run: |
+        mkdir -p $GITHUB_WORKSPACE/bin
+        wget -O $GITHUB_WORKSPACE/bin/cr http://repo.calcit-lang.org/binaries/linux/cr
+        chmod +x $GITHUB_WORKSPACE/bin/cr
+        echo "::add-path::$GITHUB_WORKSPACE/bin"
+
+    - name: "prepare modules"
+      run: >
+        mkdir -p ~/.config/calcit/modules/ && cd ~/.config/calcit/modules/
+        && git clone https://github.com/calcit-lang/lilac.git
+        && git clone https://github.com/calcit-lang/memof.git
+        && git clone https://github.com/Respo/respo.calcit.git
+        && git clone https://github.com/Respo/reel.calcit.git
+        && git clone https://github.com/Respo/respo-markdown.calcit.git
+        && git clone https://github.com/Respo/respo-ui.calcit.git
+
+    - name: "compiles to js"
+      run: >
+        cr --emit-js --once
+        && yarn && yarn vite build --base=./
+
+    - name: Deploy to server
+      id: deploy
+      uses: Pendect/action-rsyncer@v1.1.0
+      env:
+        DEPLOY_KEY: ${{secrets.rsync_private_key}}
+      with:
+        flags: '-avzr --progress'
+        options: ''
+        ssh_options: ''
+        src: 'dist/*'
+        dest: 'rsync-user@tiye.me:/web-assets/repo/${{ github.repository }}'
+
+    - name: Display status from deploy
+      run: echo "${{ steps.deploy.outputs.status }}"

.gitignore

@@ -1,8 +1,7 @@
 
-/target/
-/dist
-/node_modules
-.cpcache/
-.shadow-cljs/
+.compact-inc.cirru
+.calcit-error.cirru
 
-.nrepl-port
+js-out/
+node_modules/
+dist/

entry/main.css assets/main.cssentry/main.css renamed to assets/main.css

@@ -0,0 +1,123 @@
+
+{} (:package |text-diff)
+  :configs $ {} (:init-fn |text-diff.main/main!) (:reload-fn |text-diff.main/reload!)
+    :modules $ [] |respo.calcit/ |lilac/ |memof/ |respo-ui.calcit/ |respo-markdown.calcit/ |reel.calcit/
+    :version nil
+  :files $ {}
+    |text-diff.config $ {}
+      :ns $ quote (ns text-diff.config)
+      :defs $ {}
+        |cdn? $ quote
+          def cdn? $ cond
+              exists? js/window
+              , false
+            (exists? js/process) (= "\"true" js/process.env.cdn)
+            :else false
+        |dev? $ quote
+          def dev? $ = "\"dev" (get-env "\"mode")
+        |site $ quote
+          def site $ {} (:dev-ui "\"http://localhost:8100/main-fonts.css") (:release-ui "\"http://cdn.tiye.me/favored-fonts/main-fonts.css") (:cdn-url "\"http://cdn.tiye.me/calcit-workflow/") (:title "\"Calcit") (:icon "\"http://cdn.tiye.me/logo/mvc-works.png") (:storage-key "\"workflow")
+    |text-diff.schema $ {}
+      :ns $ quote (ns text-diff.schema)
+      :defs $ {}
+        |store $ quote
+          def store $ {}
+            :states $ {}
+            :content |
+    |text-diff.updater $ {}
+      :ns $ quote
+        ns text-diff.updater $ :require
+          [] respo.cursor :refer $ [] update-states
+      :defs $ {}
+        |updater $ quote
+          defn updater (store op op-data op-id op-time)
+            case-default op
+              do (println "\"Unknown op:" op) store
+              :states $ update-states store op-data
+              :content $ assoc store :content op-data
+              :hydrate-storage op-data
+    |text-diff.comp.container $ {}
+      :ns $ quote
+        ns text-diff.comp.container $ :require
+          [] hsl.core :refer $ [] hsl
+          [] respo-ui.core :as ui
+          [] respo.core :refer $ [] defcomp >> <> div button textarea span input
+          [] respo.comp.space :refer $ [] =<
+          [] reel.comp.reel :refer $ [] comp-reel
+          [] respo-md.comp.md :refer $ [] comp-md
+          [] text-diff.config :refer $ [] dev?
+      :defs $ {}
+        |comp-container $ quote
+          defcomp comp-container (reel)
+            let
+                store $ :store reel
+                states $ :states store
+              div
+                {} $ :style (merge ui/global ui/row)
+                textarea $ {}
+                  :value $ :content store
+                  :placeholder "\"Content"
+                  :style $ merge ui/expand ui/textarea
+                    {} $ :height 320
+                  :on-input $ fn (e d!)
+                    d! :content $ :value e
+                =< |8px nil
+                div
+                  {} $ :style ui/expand
+                  comp-md "|This is some content with `code`"
+                  =< |8px nil
+                  button $ {} (:style ui/button)
+                    :inner-text $ str |run
+                    :on-click $ fn (e d! m!)
+                      println $ :content store
+                when dev? $ comp-reel (>> states :reel) reel ({})
+    |text-diff.main $ {}
+      :ns $ quote
+        ns text-diff.main $ :require
+          [] respo.core :refer $ [] render! clear-cache! realize-ssr!
+          [] text-diff.comp.container :refer $ [] comp-container
+          [] text-diff.updater :refer $ [] updater
+          [] text-diff.schema :as schema
+          [] reel.util :refer $ [] listen-devtools!
+          [] reel.core :refer $ [] reel-updater refresh-reel
+          reel.schema :as reel-schema
+          [] text-diff.config :as config
+          "\"./calcit.build-errors" :default build-errors
+          "\"bottom-tip" :default hud!
+      :defs $ {}
+        |render-app! $ quote
+          defn render-app! () $ render! mount-target (comp-container @*reel) dispatch!
+        |persist-storage! $ quote
+          defn persist-storage! (? e)
+            .setItem js/localStorage (:storage-key config/site)
+              format-cirru-edn $ :store @*reel
+        |mount-target $ quote
+          def mount-target $ .querySelector js/document |.app
+        |*reel $ quote
+          defatom *reel $ -> reel-schema/reel (assoc :base schema/store) (assoc :store schema/store)
+        |main! $ quote
+          defn main! ()
+            println "\"Running mode:" $ if config/dev? "\"dev" "\"release"
+            render-app!
+            add-watch *reel :changes $ fn (r p) (render-app!)
+            listen-devtools! |a dispatch!
+            .addEventListener js/window |beforeunload persist-storage!
+            ; repeat! 60 persist-storage!
+            let
+                raw $ .getItem js/localStorage (:storage-key config/site)
+              when (some? raw)
+                dispatch! :hydrate-storage $ parse-cirru-edn raw
+            println "|App started."
+        |snippets $ quote
+          defn snippets () $ println config/cdn?
+        |dispatch! $ quote
+          defn dispatch! (op op-data)
+            when config/dev? $ println "\"Dispatch:" op
+            reset! *reel $ reel-updater updater @*reel op op-data
+        |reload! $ quote
+          defn reload! () $ if (nil? build-errors)
+            do (remove-watch *reel :changes) (clear-cache!)
+              add-watch *reel :changes $ fn (reel prev) (render-app!)
+              reset! *reel $ refresh-reel @*reel schema/store updater
+              hud! "\"ok~" "\"Ok"
+            hud! "\"error" build-errors

entry/manifest.json assets/manifest.jsonentry/manifest.json renamed to assets/manifest.json

@@ -0,0 +1,21 @@
+
+<!DOCTYPE html>
+<html>
+
+<head>
+  <title>TextDiff</title>
+  <link href="https://cdn.tiye.me/logo/calcit.png" rel="icon" type="image/png" />
+  <meta charset="utf-8">
+  <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, minimum-scale=1, user-scalable=no"/>
+  <link rel="stylesheet" type="text/css" href="https://cdn.tiye.me/favored-fonts/main-fonts.css">
+  <link rel="stylesheet" type="text/css" href="./assets/main.css">
+</head>
+
+<body>
+  <div class="app" ></div>
+
+  <script type="module" src="./main.js" ></script>
+
+</body>
+
+</html>

calcit.cirru

@@ -0,0 +1,10 @@
+
+import { main_$x_ } from "./js-out/text-diff.main.js"
+
+main_$x_()
+
+if (import.meta.hot) {
+  import.meta.hot.accept('./js-out/text-diff.main.js', (main) => {
+    main.reload_$x_()
+  })
+}