Squint

.bb/tasks.bb

@@ -0,0 +1,20 @@
+(ns tasks
+  (:require
+   [babashka.tasks :refer [shell]]
+   [clojure.string :as str]))
+
+(defn watch-cljs []
+  (let [watch (requiring-resolve 'pod.babashka.fswatcher/watch)
+        ret (watch "src-squint"
+                   (fn [{:keys [type path]}]
+                     (when (and (#{:write :write|chmod :create} type)
+                                (or (str/ends-with? path ".cljs")
+                                    (str/ends-with? path ".cljc"))
+                                ;; emacs shit:
+                                (not (str/includes? path ".#")))
+                       (shell {:continue true
+                               :err :inherit
+                               :std :inherit} "yarn squint compile --output-dir public/squint/js" path)))
+                   {:recursive true})]
+    (println (str "Started watching: " ret))
+    @(promise)))

.clj-kondo/config.edn

@@ -0,0 +1,4 @@
+{:cljc {:features [:cljs]}
+ :lint-as {applied-science.js-interop/defn clojure.core/defn
+           applied-science.js-interop/fn clojure.core/fn
+           applied-science.js-interop/let clojure.core/let}}

.github/workflows/main.yml

@@ -21,9 +21,14 @@ jobs:
       - name: 🧶 Yarn Install
         run: yarn install
 
-      - name: 🧪 Run tests
+      - name: 🧪 Run CLJS tests
         run: yarn test
 
+      - name: 🧪 Run squint tests
+        run: |
+          yarn squint compile
+          node dist/nextjournal/clojure_mode_tests.mjs
+
   snapshot:
     name: Static App / Build
     runs-on: ubuntu-latest
@@ -52,7 +57,13 @@ jobs:
         run: yarn install
 
       - name: 🧶 Yarn Build
-        run: yarn build
+        run: |
+          yarn build
+
+      - name: 🧶 Squint build
+        run: |
+          yarn squint compile
+          yarn vite:build
 
       - name: 📠 Copy static build to bucket under SHA
         run: gsutil cp -r public gs://nextjournal-snapshots/clojure-mode/build/${{ github.sha }}

.gitignore

@@ -1,12 +1,12 @@
 .shadow-cljs
 .idea
 .calva
-.clj-kondo
+.cache
 .cpcache
-.lsp
 public/js
 public/livedoc/js
 node_modules
 public/test
 *.iml
 out
+dist

bb.edn

@@ -1,15 +1,56 @@
 {:min-bb-version "0.7.6"
- :paths ["bb"]
+ :paths [".bb"]
+ :pods {org.babashka/fswatcher {:version "0.0.4"}}
  :tasks
  {:requires ([clojure.edn :as edn]
              [clojure.string :as str]
              [babashka.deps :as deps]
              [babashka.fs :as fs]
-             [babashka.process :as p])
+             [babashka.process :as p]
+             [tasks :as t])
   :init (do
           (defn viewer-css-path []
             (let [cp (str/trim (with-out-str (deps/clojure ["-A:dev:demo" "-Spath"])))]
-              (str/trim (:out (shell {:out :string} (str "bb -cp " cp " -e '(println (.getPath (clojure.java.io/resource \"css/viewer.css\")))'")))))))
+              (str/trim (:out (shell {:out :string} (str "bb -cp " cp " -e '(println (.getPath (clojure.java.io/resource \"css/viewer.css\")))'"))))))
+
+          (defn get-paths [ext]
+            (map str (fs/glob "." (str "{demo,src,collab}/**." (name ext))))))
 
   copy-viewer-css {:doc "Copies viewer stylesheet to resources."
-                   :task (fs/copy (viewer-css-path) "resources/stylesheets/viewer.css" #{:replace-existing})}}}
+                   :task (fs/copy (viewer-css-path) "resources/stylesheets/viewer.css" #{:replace-existing})}
+
+  yarn-install (shell "yarn install")
+
+  clean (let [paths (get-paths :mjs)]
+          (println (apply str (interpose "\n" (cons "removing:" paths))))
+          (doseq [path paths] (fs/delete path)))
+
+  #_#_compile {:doc "Use squintjs to compile all cljs files recursively"
+               :depends [yarn-install]
+               :task (shell {:std :inherit :err :inherit}
+                            (apply str (cons "yarn squint compile "
+                                             (interpose " " (get-paths :cljs)))))}
+
+  #_#_build {:doc "Compiles cljs files with squint and builds from mjs sources with vite"
+             :depends [compile]
+             :task (shell {:std :inherit :err :inherit}
+                          "yarn build")}
+
+  watch-cljs (shell "yarn run squint watch")
+
+  yarn-install:squint-dev (do
+                            (shell "yarn add squint-cljs@link:../squint")
+                            (shell {:dir "node_modules/.bin"} "ln -sf" "../squint-cljs/node_cli.js" "squint"))
+
+  vite:dev {:doc "Launches vite application"
+            :depends [yarn-install]
+            :task (shell "yarn vite:dev")}
+
+  vite:build {:depends [yarn-install]
+              :task (shell "yarn vite:build")}
+
+  -dev {:depends [vite:dev watch-cljs]}
+
+  dev {:doc "Compiles all cljs to mjs, runs vite in dev and starts a cherry watcher to recompile changed cljs. When run as `bb dev collab` also starts a Y.js collaboration server."
+       ;; :depends [compile]
+       :task (run '-dev {:parallel true})}}}

deps.edn

@@ -1,4 +1,5 @@
-{:deps {applied-science/js-interop {:mvn/version "0.3.3"}
+{:paths ["src-shared" "src"]
+ :deps {applied-science/js-interop {:mvn/version "0.3.3"}
         org.clojure/clojure {:mvn/version "1.10.3"}
         org.clojure/clojurescript {:mvn/version "1.10.866"}}
  :aliases

package.json

@@ -1,39 +1,58 @@
-{
-    "dependencies": {
-        "@codemirror/autocomplete": "^6.0.2",
-        "@codemirror/commands": "^6.0.0",
-        "@codemirror/lang-markdown": "6.0.0",
-        "@codemirror/language": "^6.1.0",
-        "@codemirror/lint": "^6.0.0",
-        "@codemirror/search": "^6.0.0",
-        "@codemirror/state": "^6.0.1",
-        "@codemirror/view": "^6.0.2",
-        "@lezer/common": "^1.0.0",
-        "@lezer/generator": "^1.0.0",
-        "@lezer/highlight": "^1.0.0",
-        "@lezer/lr": "^1.0.0",
-        "@nextjournal/lezer-clojure": "1.0.0",
-        "d3-require": "^1.2.4",
-        "emoji-regex": "^10.0.0",
-        "framer-motion": "^6.2.8",
-        "katex": "^0.12.0",
-        "markdown-it": "12.3.2",
-        "markdown-it-block-image": "0.0.3",
-        "markdown-it-sidenote": "gerwitz/markdown-it-sidenote#aa5de8ce3168b7d41cb33c3aed071a5f41ce0083",
-        "markdown-it-texmath": "0.9.1",
-        "markdown-it-toc-done-right": "4.2.0",
-        "punycode": "2.1.1",
-        "react": "^17.0.2",
-        "react-dom": "^17.0.2",
-        "w3c-keyname": "^2.2.4"
-    },
-    "scripts": {
-        "watch": "bb copy-viewer-css && shadow-cljs -A:demo watch demo livedoc test",
-        "build": "shadow-cljs -A:demo release demo livedoc",
-        "test": "shadow-cljs -A:dev release ci-test && node out/node-tests.js",
-        "watch2": "git ls-files | entr yarn test"
-    },
-    "devDependencies": {
-        "shadow-cljs": "2.19.5"
-    }
+{ "name": "@nextjournal/clojure-mode",
+  "files": ["dist"],
+  "version": "0.1.0-rc2",
+  "license": "EPL-2.0",
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/nextjournal/clojure-mode"
+  },
+  "dependencies": {
+    "@codemirror/autocomplete": "^6.0.2",
+    "@codemirror/commands": "^6.0.0",
+    "@codemirror/lang-markdown": "6.0.0",
+    "@codemirror/language": "^6.1.0",
+    "@codemirror/lint": "^6.0.0",
+    "@codemirror/search": "^6.0.0",
+    "@codemirror/state": "^6.0.1",
+    "@codemirror/view": "^6.0.2",
+    "@lezer/common": "^1.0.0",
+    "@lezer/generator": "^1.0.0",
+    "@lezer/highlight": "^1.0.0",
+    "@lezer/lr": "^1.0.0",
+    "@nextjournal/lezer-clojure": "1.0.0",
+    "d3-require": "^1.2.4",
+    "emoji-regex": "^10.0.0",
+    "framer-motion": "^6.2.8",
+    "katex": "^0.12.0",
+    "markdown-it": "12.3.2",
+    "markdown-it-block-image": "0.0.3",
+    "markdown-it-sidenote": "https://github.com/gerwitz/markdown-it-sidenote#aa5de8ce3168b7d41cb33c3aed071a5f41ce0083",
+    "markdown-it-texmath": "0.9.1",
+    "markdown-it-toc-done-right": "4.2.0",
+    "punycode": "2.1.1",
+    "react": "^17.0.2",
+    "react-dom": "^17.0.2",
+    "squint-cljs": "0.3.36",
+    "w3c-keyname": "^2.2.4"
+  },
+  "comments": {
+    "to run squint as a local dependency:": "bb yarn-install:squint-dev"
+  },
+  "scripts": {
+    "watch": "bb copy-viewer-css && shadow-cljs -A:demo watch demo livedoc test",
+    "build": "shadow-cljs -A:demo release demo livedoc",
+    "test": "shadow-cljs -A:dev release ci-test && node out/node-tests.js",
+    "watch2": "git ls-files | entr yarn test",
+    "vite:dev": "vite --open -l info --config vite.config.js public/squint",
+    "vite:build": "yarn vite build --config vite.config.js public/squint"
+  },
+  "devDependencies": {
+    "@nextjournal/clojure-mode": "link:.",
+    "shadow-cljs": "2.19.5",
+    "vite": "^4.4.9",
+    "rollup-plugin-analyzer": "^4.0.0"
+  },
+  "exports": {
+    ".": "dist/nextjournal/clojure_mode.mjs"
+  }
 }