Upgrade clojure-mode to CodeMirror 0.17 and fix deps.cljs

mk · kommen · nextjournal-ci · commit db808194244b · 2021-01-07T15:45:42.000Z
* Upgrade to CodeMirror 0.17 and fix deps.cljs
* Fix build due to modularization of latest code mirror

Co-authored-by: Dieter Komendera &lt;dieter@komendera.com&gt;
diff --git a/src/deps.cljs b/src/deps.cljs
@@ -1 +1,16 @@
-{:npm-deps {"lezer-clojure" "0.1.9"}}
+{:npm-deps {"@codemirror/autocomplete" "^0.17.0",
+            "@codemirror/closebrackets" "^0.17.0",
+            "@codemirror/commands" "^0.17.0",
+            "@codemirror/comment" "^0.17.0",
+            "@codemirror/fold" "^0.17.0",
+            "@codemirror/gutter" "^0.17.0",
+            "@codemirror/highlight" "^0.17.0",
+            "@codemirror/history" "^0.17.0",
+            "@codemirror/language" "^0.17.0",
+            "@codemirror/lint" "^0.17.0",
+            "@codemirror/matchbrackets" "^0.17.0",
+            "@codemirror/rectangular-selection" "^0.17.0",
+            "@codemirror/search" "^0.17.0",
+            "@codemirror/state" "^0.17.0",
+            "@codemirror/view" "^0.17.0",
+            "lezer-clojure" "0.1.10"}}
diff --git a/src/nextjournal/clojure_mode.cljs b/src/nextjournal/clojure_mode.cljs
@@ -1,8 +1,8 @@
 (ns nextjournal.clojure-mode
-  (:require ["@codemirror/next/highlight" :as highlight :refer [tags]]
-            ["@codemirror/next/state" :refer [EditorState]]
-            ["@codemirror/next/language" :as language]
-            ["@codemirror/next/view" :as view :refer [EditorView keymap]]
+  (:require ["@codemirror/highlight" :as highlight :refer [tags]]
+            ["@codemirror/state" :refer [EditorState]]
+            ["@codemirror/language" :as language]
+            ["@codemirror/view" :as view :refer [EditorView keymap]]
             ["lezer" :as lezer]
             ["lezer-clojure" :as lezer-clj]
             ["lezer-tree" :as lz-tree]
diff --git a/src/nextjournal/clojure_mode/chars.cljs b/src/nextjournal/clojure_mode/chars.cljs
@@ -1,5 +1,5 @@
 (ns nextjournal.clojure-mode.chars
-  (:require ["@codemirror/next/text" :as text]))
+  (:require ["@codemirror/text" :as text]))
 
 (defn pair-lookup [char-pairs ^string char]
   (let [end (count char-pairs)
diff --git a/src/nextjournal/clojure_mode/commands.cljs b/src/nextjournal/clojure_mode/commands.cljs
@@ -1,6 +1,6 @@
 (ns nextjournal.clojure-mode.commands
-  (:require ["@codemirror/next/commands" :as commands :refer [defaultKeymap]]
-            ["@codemirror/next/state" :refer [EditorState IndentContext]]
+  (:require ["@codemirror/commands" :as commands :refer [defaultKeymap]]
+            ["@codemirror/state" :refer [EditorState IndentContext]]
             [applied-science.js-interop :as j]
             [nextjournal.clojure-mode.util :as u]
             [nextjournal.clojure-mode.selections :as sel]
diff --git a/src/nextjournal/clojure_mode/extensions/close_brackets.cljs b/src/nextjournal/clojure_mode/extensions/close_brackets.cljs
@@ -1,12 +1,12 @@
 (ns nextjournal.clojure-mode.extensions.close-brackets
   (:require ["w3c-keyname" :refer [keyName]]
-            ["@codemirror/next/view" :as view]
-            ["@codemirror/next/state" :refer [EditorState
-                                              EditorSelection
-                                              Transaction
-                                              CharCategory
-                                              Extension]]
-            ["@codemirror/next/text" :as text :refer [Text]]
+            ["@codemirror/view" :as view]
+            ["@codemirror/state" :refer [EditorState
+                                         EditorSelection
+                                         Transaction
+                                         CharCategory
+                                         Extension]]
+            ["@codemirror/text" :as text :refer [Text]]
             [applied-science.js-interop :as j]
             [nextjournal.clojure-mode.selections :as sel]
             [nextjournal.clojure-mode.node :as n]
diff --git a/src/nextjournal/clojure_mode/extensions/eval_region.cljs b/src/nextjournal/clojure_mode/extensions/eval_region.cljs
@@ -1,7 +1,7 @@
 (ns nextjournal.clojure-mode.extensions.eval-region
   (:require
-   ["@codemirror/next/state" :as state :refer [StateEffect StateField]]
-   ["@codemirror/next/view" :as view :refer [EditorView Decoration keymap]]
+   ["@codemirror/state" :as state :refer [StateEffect StateField]]
+   ["@codemirror/view" :as view :refer [EditorView Decoration keymap]]
    ["w3c-keyname" :refer [keyName]]
    [applied-science.js-interop :as j]
    [nextjournal.clojure-mode.util :as u]
diff --git a/src/nextjournal/clojure_mode/extensions/formatting.cljs b/src/nextjournal/clojure_mode/extensions/formatting.cljs
@@ -1,8 +1,8 @@
 (ns nextjournal.clojure-mode.extensions.formatting
-  (:require ["@codemirror/next/language" :as language :refer [IndentContext]]
-            ["@codemirror/next/state" :refer [EditorState Transaction]]
-            ["@codemirror/next/view" :as view]
-            ["@codemirror/next/commands" :as commands]
+  (:require ["@codemirror/language" :as language :refer [IndentContext]]
+            ["@codemirror/state" :refer [EditorState Transaction]]
+            ["@codemirror/view" :as view]
+            ["@codemirror/commands" :as commands]
             [applied-science.js-interop :as j]
             [nextjournal.clojure-mode.util :as u]
             [nextjournal.clojure-mode.node :as n]))
diff --git a/src/nextjournal/clojure_mode/extensions/match_brackets.cljs b/src/nextjournal/clojure_mode/extensions/match_brackets.cljs
@@ -1,13 +1,13 @@
 (ns nextjournal.clojure-mode.extensions.match-brackets
   (:require
-    ["@codemirror/next/state" :refer [EditorState
-                                      StateField
-                                      Extension]]
-    ["@codemirror/next/view" :refer [EditorView themeClass
-                                     Decoration DecorationSet]]
-    [applied-science.js-interop :as j]
-    [nextjournal.clojure-mode.node :as n]
-    [nextjournal.clojure-mode.util :as u]))
+   ["@codemirror/state" :refer [EditorState
+                                StateField
+                                Extension]]
+   ["@codemirror/view" :refer [EditorView themeClass
+                               Decoration DecorationSet]]
+   [applied-science.js-interop :as j]
+   [nextjournal.clojure-mode.node :as n]
+   [nextjournal.clojure-mode.util :as u]))
 
 (def base-theme
   (->>
diff --git a/src/nextjournal/clojure_mode/extensions/selection_history.cljs b/src/nextjournal/clojure_mode/extensions/selection_history.cljs
@@ -1,5 +1,5 @@
 (ns nextjournal.clojure-mode.extensions.selection-history
-  (:require ["@codemirror/next/state" :refer [Facet Extension EditorSelection StateField]]
+  (:require ["@codemirror/state" :refer [Facet Extension EditorSelection StateField]]
             [applied-science.js-interop :as j]
             [nextjournal.clojure-mode.util :as u]
             [nextjournal.clojure-mode.selections :as sel]
@@ -87,4 +87,4 @@
                        :annotations event-annotation})
     (u/update-ranges state
                      #js{:annotations event-annotation}
-                     (fn [^js range] {:cursor (.-from range)}))))
+                     (fn [^js range] {:cursor (.-from range)}))))
diff --git a/src/nextjournal/clojure_mode/keymap.cljs b/src/nextjournal/clojure_mode/keymap.cljs
@@ -1,5 +1,5 @@
 (ns nextjournal.clojure-mode.keymap
-  (:require ["@codemirror/next/commands" :as commands :refer [defaultKeymap]]
+  (:require ["@codemirror/commands" :as commands :refer [defaultKeymap]]
             [clojure.set :as set]
             [nextjournal.clojure-mode.commands :as cmd]))
 
diff --git a/src/nextjournal/clojure_mode/node.cljs b/src/nextjournal/clojure_mode/node.cljs
@@ -3,7 +3,7 @@
   (:require ["lezer-tree" :as lz-tree]
             ["lezer" :as lezer]
             ["lezer-clojure" :as lezer-clj]
-            ["@codemirror/next/language" :as language]
+            ["@codemirror/language" :as language]
             [clojure.core :as core]
             [applied-science.js-interop :as j]
             [nextjournal.clojure-mode.util :as u]
diff --git a/src/nextjournal/clojure_mode/selections.cljs b/src/nextjournal/clojure_mode/selections.cljs
@@ -1,6 +1,6 @@
 (ns nextjournal.clojure-mode.selections
   (:refer-clojure :exclude [range])
-  (:require ["@codemirror/next/state" :refer [EditorSelection]]))
+  (:require ["@codemirror/state" :refer [EditorSelection]]))
 
 (defn range
   ([from to] (.range EditorSelection from to))
diff --git a/src/nextjournal/clojure_mode/test_utils.cljs b/src/nextjournal/clojure_mode/test_utils.cljs
@@ -1,5 +1,5 @@
 (ns nextjournal.clojure-mode.test-utils
-  (:require ["@codemirror/next/state" :as cm-state
+  (:require ["@codemirror/state" :as cm-state
              :refer [EditorState EditorSelection Extension StateCommand
                      ChangeSet ChangeDesc TransactionSpec StrictTransactionSpec]]
             [applied-science.js-interop :as j]
diff --git a/src/nextjournal/clojure_mode/util.cljs b/src/nextjournal/clojure_mode/util.cljs
@@ -1,12 +1,12 @@
 (ns nextjournal.clojure-mode.util
   (:require [applied-science.js-interop :as j]
-            ["@codemirror/next/state" :refer [EditorSelection
-                                              ChangeSet
-                                              ChangeDesc
-                                              TransactionSpec
-                                              StrictTransactionSpec
-                                              StateEffect
-                                              Transaction]]
+            ["@codemirror/state" :refer [EditorSelection
+                                         ChangeSet
+                                         ChangeDesc
+                                         TransactionSpec
+                                         StrictTransactionSpec
+                                         StateEffect
+                                         Transaction]]
             [nextjournal.clojure-mode.selections :as sel]))
 
 (defn user-event-annotation [event-name]
