From 30734703edc50d7e4eced04c82226fab57d11757 Mon Sep 17 00:00:00 2001 From: Andrea Amantini Date: Thu, 27 Jul 2023 13:11:26 +0200 Subject: [PATCH] Leave working comment --- .github/workflows/main.yml | 4 ++-- src/nextjournal/clerk/builder.clj | 13 +++++++------ 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 0149e807e..17f8773a2 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -164,7 +164,7 @@ jobs: target_url: https://snapshots.nextjournal.com/clerk/build/${{ github.sha }} ssr: - name: SSR smoke test build + name: SSR + CSS compilation smoke test runs-on: ubuntu-latest needs: [build-and-upload-viewer-resources] steps: @@ -217,7 +217,7 @@ jobs: uses: Sibz/github-status-action@v1 with: authToken: ${{secrets.GITHUB_TOKEN}} - context: 'Continuous Delivery / SSR Static App' + context: 'Continuous Delivery / SSR Static App with compiled CSS' description: 'Ready' state: 'success' sha: ${{github.event.pull_request.head.sha || github.sha}} diff --git a/src/nextjournal/clerk/builder.clj b/src/nextjournal/clerk/builder.clj index 60d754dbb..8ba4cc3a0 100644 --- a/src/nextjournal/clerk/builder.clj +++ b/src/nextjournal/clerk/builder.clj @@ -458,9 +458,6 @@ (build-static-app! {:paths ["index.clj" "notebooks/rule_30.clj" "notebooks/markdown.md"] :bundle? false :browse? true}) (build-static-app! {:paths ["notebooks/viewers/**"]}) (build-static-app! {:index "notebooks/rule_30.clj" :git/sha "bd85a3de12d34a0622eb5b94d82c9e73b95412d1" :git/url "https://github.com/nextjournal/clerk"}) - (reset! config/!resource->url @config/!asset-map) - (swap! config/!resource->url dissoc "/css/viewer.css") - (build-static-app! {:ssr? true :exclude-js? true ;; test against cljs release `bb build:js` @@ -474,9 +471,13 @@ :index "notebooks/rule_30.clj"}) (fs/delete-tree "public/build") (build-static-app! {:compile-css? true - :index "notebooks/rule_30.clj" - :paths ["notebooks/hello.clj" - "notebooks/markdown.md"]}) + :resource->url @config/!asset-map + ;; shadow-cljs release viewer --config-merge '{:output-dir "public/build/js"}' + ;; :resource->url {"/js/viewer.js" "js/viewer.js"} + :paths ["index.md" + "notebooks/links.md" + "notebooks/rule_30.clj" + "notebooks/viewers/image.clj"]}) (build-static-app! {;; test against cljs release `bb build:js` :resource->url {"/js/viewer.js" "/viewer.js"} :paths ["notebooks/cherry.clj"]