Use @nextjournal/lezer-clojure v1.0.0

Author: zampino

package.json

@@ -12,11 +12,11 @@
         "@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",
-        "lezer-clojure": "1.0.0-rc.2",
         "markdown-it": "12.3.2",
         "markdown-it-block-image": "0.0.3",
         "markdown-it-sidenote": "gerwitz/markdown-it-sidenote#aa5de8ce3168b7d41cb33c3aed071a5f41ce0083",

shadow-cljs.edn

@@ -18,12 +18,8 @@
           :test {:compiler-options {:output-feature-set :es8}
                  :target :browser-test
                  :test-dir "public/test"
-                 :ns-regexp "-tests$"
-                 ;; sometimes I get weird $jscomp.inherits errors, which can be fixed
-                 ;; by temporarily uncommenting the following forms in each build.
-                 #_#_:js-options
-                         {:resolve {"lezer-clojure" {:target :npm
-                                                     :require "lezer-clojure/dist/index.cjs"}}}}
+                 :ns-regexp "-tests$"}
+
           :ci-test {:target :node-test
                     :ns-regexp "-tests$"
                     :output-dir "out"

src/deps.cljs

@@ -11,5 +11,5 @@
   "@lezer/generator" "^1.0.0"
   "@lezer/highlight" "^1.0.0"
   "@lezer/lr" "^1.0.0"
-  "lezer-clojure" "1.0.0-rc.2"
+  "@nextjournal/lezer-clojure" "1.0.0"
   "w3c-keyname" "^2.2.4"}}

src/nextjournal/clojure_mode.cljs

@@ -1,7 +1,7 @@
 (ns nextjournal.clojure-mode
   (:require ["@lezer/highlight" :as highlight :refer [tags]]
             ["@codemirror/language" :as language :refer [LRLanguage LanguageSupport]]
-            ["lezer-clojure" :as lezer-clj]
+            ["@nextjournal/lezer-clojure" :as lezer-clj]
             [applied-science.js-interop :as j]
             [nextjournal.clojure-mode.extensions.close-brackets :as close-brackets]
             [nextjournal.clojure-mode.extensions.match-brackets :as match-brackets]

src/nextjournal/clojure_mode/node.cljs

@@ -3,7 +3,7 @@
   (:require ["@lezer/common" :as lz-tree]
             ["@lezer/markdown" :as lezer-markdown]
             ["@codemirror/language" :as language]
-            ["lezer-clojure" :as lezer-clj]
+            ["@nextjournal/lezer-clojure" :as lezer-clj]
             [applied-science.js-interop :as j]
             [nextjournal.clojure-mode.util :as u]
             [nextjournal.clojure-mode.selections :as sel]))

yarn.lock

@@ -195,6 +195,13 @@
     "@lezer/common" "^1.0.0"
     "@lezer/highlight" "^1.0.0"
 
+"@nextjournal/[email protected]":
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/@nextjournal/lezer-clojure/-/lezer-clojure-1.0.0.tgz#0e7ff75f8d0fabed36d26b9f6b5f00d8a9f385e6"
+  integrity sha512-VZyuGu4zw5mkTOwQBTaGVNWmsOZAPw5ZRxu1/Knk/Xfs7EDBIogwIs5UXTYkuECX5ZQB8eOB+wKA2pc7VyqaZQ==
+  dependencies:
+    "@lezer/lr" "^1.0.0"
+
 argparse@^2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/argparse/-/argparse-2.0.1.tgz#246f50f3ca78a3240f6c997e8a9bd1eac49e4b38"
@@ -559,13 +566,6 @@ katex@^0.12.0:
   dependencies:
     commander "^2.19.0"
 
-[email protected]:
-  version "1.0.0-rc.2"
-  resolved "https://registry.yarnpkg.com/lezer-clojure/-/lezer-clojure-1.0.0-rc.2.tgz#cec59eafdd150bec9a5524214bc201b4ee117575"
-  integrity sha512-IdEwD9cq/PSTD3TBYHosqQQu4sKiBCdAcqucGimR0BwKRMnaPAjSgnj/JJ3ykmCwHf1pRHdVyr23gVaxYx2Tvg==
-  dependencies:
-    "@lezer/lr" "^1.0.0"
-
 linkify-it@^3.0.1:
   version "3.0.3"
   resolved "https://registry.yarnpkg.com/linkify-it/-/linkify-it-3.0.3.tgz#a98baf44ce45a550efb4d49c769d07524cc2fa2e"