try to deploy new package in new format; alpha release

tiye · tiye · commit d12a9ef6e9b4 · 2020-03-27T00:27:41.000+08:00
diff --git a/.github/workflows/npm-publish.yaml b/.github/workflows/npm-publish.yaml
@@ -0,0 +1,42 @@
+name: npm publish
+
+on:
+  release:
+    types: [created]
+
+jobs:
+  publish-npm:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      - uses: docker://timbru31/java-node:latest
+      - uses: actions/setup-node@v1
+        with:
+          node-version: 12
+          registry-url: https://registry.npmjs.org/
+
+      - name: Get yarn cache
+        id: yarn-cache
+        run: echo "::set-output name=dir::$(yarn cache dir)"
+
+      - uses: actions/cache@v1
+        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: Cache Clojars
+        uses: actions/cache@v1
+        env:
+          cache-name: cache-clojars
+        with:
+          path: ~/.m2
+          key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ hashFiles('shadow-cljs.edn') }}
+          restore-keys: |
+            ${{ runner.os }}-clojars
+
+      - run: yarn && yarn shadow-cljs release server && npm publish
+        env:
+          NODE_AUTH_TOKEN: ${{secrets.npm_token}}
diff --git a/.github/workflows/upload.yaml b/.github/workflows/upload.yaml
@@ -0,0 +1,51 @@
+name: Upload Assets
+
+on:
+  push: {}
+
+jobs:
+  upload-assets:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      - uses: docker://timbru31/java-node:latest
+
+      - name: Get yarn cache
+        id: yarn-cache
+        run: echo "::set-output name=dir::$(yarn cache dir)"
+
+      - uses: actions/cache@v1
+        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: Cache Clojars
+        uses: actions/cache@v1
+        env:
+          cache-name: cache-clojars
+        with:
+          path: ~/.m2
+          key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ hashFiles('shadow-cljs.edn') }}
+          restore-keys: |
+            ${{ runner.os }}-clojars
+
+      - run: yarn && yarn build
+        name: Build web assets
+
+      - 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@fe.jimu.io:/web-assets/repo/${{ github.repository }}'
+
+      - name: Display status from deploy
+        run: echo "${{ steps.deploy.outputs.status }}"
diff --git a/ir.edn b/ir.edn
@@ -2416,7 +2416,8 @@
                        ["[]" "respo.render.html" ":refer" ["[]" "make-string"]]
                        ["[]" "app.comp.container" ":refer" ["[]" "comp-container"]]
                        ["[]" "shell-page.core" ":refer" ["[]" "make-page" "slurp" "spit"]]
-                       ["[]" "app.schema" ":as" "schema"]]],
+                       ["[]" "app.schema" ":as" "schema"]
+                       ["[]" "cljs.reader" ":refer" ["[]" "read-string"]]]],
                  :defs {"main!" ["defn"
                                  "main!"
                                  []
@@ -2437,15 +2438,14 @@
                                      []
                                      ["let"
                                       [["html-content" ["make-string" ["comp-container" "schema/store"]]]
-                                       ["manifest" ["js/JSON.parse" ["slurp" "|dist/manifest.json"]]]]
+                                       ["assets" ["read-string" ["slurp" "|dist/assets.edn"]]]]
                                       ["make-page"
                                        "html-content"
                                        ["merge"
                                         "base-info"
                                         ["{}"
-                                         [":styles" ["[]" ["aget" "manifest" "|main.css"]]]
-                                         [":scripts"
-                                          ["[]" ["aget" "manifest" "|vendor.js"] ["aget" "manifest" "|main.js"]]]]]]]],
+                                         [":styles" ["[]"]]
+                                         [":scripts" ["map" ["fn" ["x"] [":output-name" "x"]] "assets"]]]]]]],
                         "dev-page" ["defn"
                                     "dev-page"
                                     []
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "stack-editor",
-  "version": "0.1.0",
+  "version": "0.4.0-a1",
   "description": "Stack editor",
   "main": "index.js",
   "scripts": {
@@ -9,7 +9,8 @@
     "page": "yarn shadow-cljs compile page && env=dev node target/page.js",
     "del": "rm -rf dist/*",
     "serve": "serve dist",
-    "build": "yarn del && yarn release && yarn webpack && yarn html && yarn serve"
+    "html": "shadow-cljs compile page && node target/page.js",
+    "build": "yarn del && shadow-cljs release client && yarn html"
   },
   "bin": {
     "stack-editor": "./dist/server.js",
diff --git a/server/app/server.cljs b/server/app/server.cljs
@@ -5,56 +5,55 @@
                    [cljs.core.async :refer [<! >! timeout chan]]
                    [shallow-diff.patch :refer [patch]]
                    [cirru-sepal.analyze :refer [write-file ns->path]]
+                   [cirru-edn.core :as cirru-edn]
                    [fipp.edn :refer [pprint]]
-                   [app.walk :refer [walk]])
+                   [app.walk :refer [walk]]
+                   ["fs" :as fs]
+                   ["http" :as http]
+                   ["path" :as path]
+                   ["mkdirp" :as mkdirp])
   (:require-macros [cljs.core.async.macros :refer [go]]))
 
-(def fs (js/require "fs"))
-(def http (js/require "http"))
-(def path (js/require "path"))
-(def mkdirp (js/require "mkdirp"))
-
 (def ir-path
   (or
     (get (js->clj js/process.argv) 2)
-    (if (fs.existsSync "ir.edn") "ir.edn")
-    (if (fs.existsSync "stack-sepal.ir") "stack-sepal.ir")
+    (if (fs/existsSync "stack.cirru") "stack.cirru")
     (do
-      (println "Missing file: ir.edn or stack-sepal.ir not found!")
+      (println "Missing file: stack.cirru not found!")
       (.exit js/process 1))))
 
 (def ref-sepal
   (atom
-    (if (fs.existsSync ir-path)
-        (read-string (fs.readFileSync ir-path "utf8"))
+    (if (fs/existsSync ir-path)
+        (cirru-edn/parse (fs/readFileSync ir-path "utf8"))
         (do (.log js/console (str "Error: " ir-path " does not exist!"))
             (.exit js/process 1)))))
 
 (def extension (or js/process.env.extension (:extension @ref-sepal) ".cljs"))
 (def out-folder (or js/process.env.out (get-in @ref-sepal [:options :src]) "src/"))
 (def port (js/parseInt (or js/process.env.port (get-in @ref-sepal [:options :port]) "7010")))
 
-(defn read-body [req]
+(defn read-body [^js req]
   (let [body-ref (atom "")
         body-chan (chan)]
     (.on req "data" (fn [chunk] (swap! body-ref str chunk)))
     (.on req "end" (fn [] (go (>! body-chan @body-ref))))
     body-chan))
 
 (defn rewrite-file! [content]
-  (fs.writeFileSync ir-path (with-out-str (pprint content {:width 120}))))
+  (fs/writeFileSync ir-path (cirru-edn/write content)))
 
 (defn write-by-file [pkg ns-part file-info]
   (let [file-name (str (ns->path pkg ns-part) extension)
         content (write-file file-info)
-        file-target (path.join out-folder file-name)
-        container (path.dirname file-target)]
+        file-target (path/join out-folder file-name)
+        container (path/dirname file-target)]
     (println "File compiled:" file-name)
-    (if (not (fs.existsSync container))
+    (if (not (fs/existsSync container))
         (do
           (println "Creating folder:" container)
-          (mkdirp.sync container)))
-    (fs.writeFileSync file-target content)))
+          (mkdirp/sync container)))
+    (fs/writeFileSync file-target content)))
 
 (defn compare-write-source! [sepal-data]
   (doseq [entry (:files sepal-data)]
@@ -68,7 +67,7 @@
     (let [[ns-part file-info] entry]
       (write-by-file (:package sepal-data) ns-part file-info))))
 
-(defn req-handler [req res]
+(defn req-handler [^js req ^js res]
   (if (some? req.headers.origin)
     (.setHeader res "Access-Control-Allow-Origin" req.headers.origin))
   (.setHeader res "Content-Type" "text/edn; charset=UTF-8")
@@ -92,7 +91,7 @@
     (.end res (str "Unknown:" req.method))))
 
 (defn create-app! []
-  (let [app (http.createServer req-handler)]
+  (let [app (http/createServer req-handler)]
     (.listen app port)
     (println "File:" ir-path)
     (println "Port:" port)
@@ -110,7 +109,7 @@
   (map
     (fn [ns-part]
       (string/replace
-        (path.join out-folder
+        (path/join out-folder
                    (string/replace (:package @ref-sepal) "." "/")
                    (str (string/replace ns-part "." "/") extension))
         "-" "_"))
@@ -128,12 +127,12 @@
       ; (println "alive-files" alive-files)
       ; (println "existing-files" existing-files)
       (doseq [file-path removed-files]
-        (fs.unlinkSync file-path)
+        (fs/unlinkSync file-path)
         (println "Redundant file:" file-path)))))
 
 (.on js/process "SIGINT"
   (fn []
-    (if (fs.existsSync out-folder) (check-removed!))
+    (if (fs/existsSync out-folder) (check-removed!))
     (.exit js/process)))
 
 (defn reload! []
diff --git a/server/app/walk.cljs b/server/app/walk.cljs
@@ -1,18 +1,17 @@
 
-(ns app.walk)
+(ns app.walk
+  (:require ["fs" :as fs]
+            ["path" :as path]))
 
-(def fs (js/require "fs"))
-(def path (js/require "path"))
-
-(defn dir? [x] (.isDirectory (fs.statSync x)))
-(defn file? [x] (.isFile (fs.statSync x)))
+(defn dir? [x] (.isDirectory (fs/statSync x)))
+(defn file? [x] (.isFile (fs/statSync x)))
 
 (defn walk [base-dir collect!]
-  (let [children (js->clj (fs.readdirSync base-dir))]
+  (let [children (js->clj (fs/readdirSync base-dir))]
     (doall
       (map
         (fn [child]
-          (let [child-path (path.join base-dir child)]
+          (let [child-path (path/join base-dir child)]
             (cond
               (dir? child-path)
                 (walk child-path collect!)
diff --git a/shadow-cljs.edn b/shadow-cljs.edn
@@ -10,6 +10,7 @@
     [cljs-ajax "0.8.0"]
     [cumulo/shallow-diff "0.1.3"]
     [fipp "0.6.22"]
+    [cirru/edn "0.0.8"]
     [cirru/sepal "0.2.7"]
     [mvc-works/polyfill "0.1.1"]
   ]
@@ -21,6 +22,7 @@
   :builds {
     :client {
       :output-dir "target", :target :browser, :asset-path "./"
+      :compiler-options {:infer-externs :auto}
       :modules {
         :client {:init-fn app.main/main!}
       }
@@ -36,6 +38,7 @@
     }
     :server {
       :target :node-script, :main app.server/main!, :output-to "target/server.js"
+      :compiler-options {:infer-externs :auto}
       :release {:output-to "dist/server.js"}
       :devtools {:after-load app.server/reload!}
     }
diff --git a/src/app/page.cljs b/src/app/page.cljs
@@ -5,7 +5,8 @@
             [respo.render.html :refer [make-string]]
             [app.comp.container :refer [comp-container]]
             [shell-page.core :refer [make-page slurp spit]]
-            [app.schema :as schema]))
+            [app.schema :as schema]
+            [cljs.reader :refer [read-string]]))
 
 (def base-info
   {:title "Stack Editor",
@@ -16,13 +17,10 @@
 
 (defn prod-page []
   (let [html-content (make-string (comp-container schema/store))
-        manifest (js/JSON.parse (slurp "dist/manifest.json"))]
+        assets (read-string (slurp "dist/assets.edn"))]
     (make-page
      html-content
-     (merge
-      base-info
-      {:styles [(aget manifest "main.css")],
-       :scripts [(aget manifest "vendor.js") (aget manifest "main.js")]}))))
+     (merge base-info {:styles [], :scripts (map (fn [x] (:output-name x)) assets)}))))
 
 (defn dev-page [] (make-page "" (merge base-info {:scripts ["/client.js"]})))
 

Original file line number	Diff line number	Diff line change
`@@ -10,6 +10,7 @@`
`10`	`10`	`[cljs-ajax "0.8.0"]`
`11`	`11`	`[cumulo/shallow-diff "0.1.3"]`
`12`	`12`	`[fipp "0.6.22"]`
	`13`	`+ [cirru/edn "0.0.8"]`
`13`	`14`	`[cirru/sepal "0.2.7"]`
`14`	`15`	`[mvc-works/polyfill "0.1.1"]`
`15`	`16`	`]`
`@@ -21,6 +22,7 @@`
`21`	`22`	`:builds {`
`22`	`23`	`:client {`
`23`	`24`	`:output-dir "target", :target :browser, :asset-path "./"`
	`25`	`+ :compiler-options {:infer-externs :auto}`
`24`	`26`	`:modules {`
`25`	`27`	`:client {:init-fn app.main/main!}`
`26`	`28`	`}`
`@@ -36,6 +38,7 @@`
`36`	`38`	`}`
`37`	`39`	`:server {`
`38`	`40`	`:target :node-script, :main app.server/main!, :output-to "target/server.js"`
	`41`	`+ :compiler-options {:infer-externs :auto}`
`39`	`42`	`:release {:output-to "dist/server.js"}`
`40`	`43`	`:devtools {:after-load app.server/reload!}`
`41`	`44`	`}`