Actually update packages for clojure-mode demo

* Actually update packages for clojure-mode demo

Author: mk

demo/src/nextjournal/clojure_mode/demo.cljs

@@ -1,11 +1,11 @@
 (ns nextjournal.clojure-mode.demo
-  (:require ["@codemirror/next/closebrackets" :refer [closeBrackets]]
-            ["@codemirror/next/fold" :as fold]
-            ["@codemirror/next/gutter" :refer [lineNumbers]]
-            ["@codemirror/next/highlight" :as highlight]
-            ["@codemirror/next/history" :refer [history historyKeymap]]
-            ["@codemirror/next/state" :refer [EditorState]]
-            ["@codemirror/next/view" :as view :refer [EditorView]]
+  (:require ["@codemirror/closebrackets" :refer [closeBrackets]]
+            ["@codemirror/fold" :as fold]
+            ["@codemirror/gutter" :refer [lineNumbers]]
+            ["@codemirror/highlight" :as highlight]
+            ["@codemirror/history" :refer [history historyKeymap]]
+            ["@codemirror/state" :refer [EditorState]]
+            ["@codemirror/view" :as view :refer [EditorView]]
             ["lezer" :as lezer]
             ["lezer-generator" :as lg]
             ["lezer-tree" :as lz-tree]

demo/src/nextjournal/clojure_mode/demo/sci.cljs

@@ -1,5 +1,5 @@
 (ns nextjournal.clojure-mode.demo.sci
-  (:require ["@codemirror/next/view" :as view]
+  (:require ["@codemirror/view" :as view]
             [applied-science.js-interop :as j]
             [sci.core :as sci]
             [nextjournal.clojure-mode.node :as n]

package.json

@@ -1,10 +1,24 @@
 {
     "dependencies": {
-        "@codemirror/next": "^0.16.0",
+        "@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": "^0.13.1",
         "lezer-clojure": "0.1.10",
-        "lezer-tree": "^0.13.0",
         "lezer-generator": "^0.13.0",
+        "lezer-tree": "^0.13.0",
         "platform": "1.3.5",
         "react": "17.0.1",
         "react-dom": "17.0.1",

test/nextjournal/clojure_mode_tests.cljs

@@ -1,6 +1,6 @@
 (ns nextjournal.clojure-mode-tests
   (:require ["lezer-clojure" :as lz]
-            ["@codemirror/next/state" :refer [EditorState]]
+            ["@codemirror/state" :refer [EditorState]]
             [applied-science.js-interop :as j]
             [cljs.test :refer [is are testing deftest]]
             [nextjournal.clojure-mode :as cm-clojure]

yarn.lock

@@ -2,24 +2,186 @@
 # yarn lockfile v1
 
 
-"@codemirror/next@^0.16.0":
-  version "0.16.0"
-  resolved "https://registry.yarnpkg.com/@codemirror/next/-/next-0.16.0.tgz#b96e99d73fc4254648ca925c56d594c906282de3"
-  integrity sha512-l45zvRlWL1wBHse8OSCXYIxQbeYaIO/DPcqyzUQQBYYdk/tM8ZaCmDqLS15dvLbN2EFkj8RgURg0srDlO6aYJw==
+"@codemirror/autocomplete@^0.17.0":
+  version "0.17.1"
+  resolved "https://registry.yarnpkg.com/@codemirror/autocomplete/-/autocomplete-0.17.1.tgz#e502afd15150d574beb248a9db23a5edbda2990d"
+  integrity sha512-K53TC6eH+nnmVRBoH9vgzOsyzBPlyXyYUzgE3X9SwtKVI5Csi75SEbfsAQEJEwZJbSi3PkSzHR5gPxw2rfSDYQ==
+  dependencies:
+    "@codemirror/language" "^0.17.0"
+    "@codemirror/state" "^0.17.0"
+    "@codemirror/text" "^0.17.0"
+    "@codemirror/tooltip" "^0.17.0"
+    "@codemirror/view" "^0.17.0"
+    lezer-tree "^0.13.0"
+
+"@codemirror/closebrackets@^0.17.0":
+  version "0.17.2"
+  resolved "https://registry.yarnpkg.com/@codemirror/closebrackets/-/closebrackets-0.17.2.tgz#f78c750c43da4655bf9026a937fd37324767193d"
+  integrity sha512-0ljN56AW9Iu3uATSZESPt2MuPXpZwB9PKCK0liO9Ei1MXba//SDkzDaYeoIjlVLTxUaGbVo77fsh7+rrY28hLg==
+  dependencies:
+    "@codemirror/language" "^0.17.0"
+    "@codemirror/rangeset" "^0.17.0"
+    "@codemirror/state" "^0.17.0"
+    "@codemirror/text" "^0.17.0"
+    "@codemirror/view" "^0.17.0"
+
+"@codemirror/commands@^0.17.0":
+  version "0.17.1"
+  resolved "https://registry.yarnpkg.com/@codemirror/commands/-/commands-0.17.1.tgz#2e5d3af42afc8f305a272d127ba3a471a79ff21a"
+  integrity sha512-y04Rl3kcpnTSzkgnvghjF/9UNjrdVAvT+hxnpuad2OhPcRDEWuFqwwEM7ZpzAkyjFNCG5+KDXuhnERk9cxF6/Q==
+  dependencies:
+    "@codemirror/language" "^0.17.0"
+    "@codemirror/matchbrackets" "^0.17.0"
+    "@codemirror/state" "^0.17.0"
+    "@codemirror/text" "^0.17.0"
+    "@codemirror/view" "^0.17.0"
+    lezer-tree "^0.13.0"
+
+"@codemirror/comment@^0.17.0":
+  version "0.17.1"
+  resolved "https://registry.yarnpkg.com/@codemirror/comment/-/comment-0.17.1.tgz#ef3104d411ade2fcf548327f96f00a82533fee89"
+  integrity sha512-dRYCRMU8NEe4mbL00AU4Zr8DYqYC5kL2bg28wBSURKYYKtTv3c7KsvdwU/Ggj8pDFcW0TIaKt1DfSKH6RDfaQw==
+  dependencies:
+    "@codemirror/state" "^0.17.0"
+    "@codemirror/text" "^0.17.0"
+    "@codemirror/view" "^0.17.0"
+
+"@codemirror/fold@^0.17.0":
+  version "0.17.1"
+  resolved "https://registry.yarnpkg.com/@codemirror/fold/-/fold-0.17.1.tgz#7ff1e6a2d185acbd833339610e9b12504e76b6c0"
+  integrity sha512-G0j7AyZtcDQy/Vh7MQgIZIYcTJX6BuSa8NcxE82sDtpEDdogavBkjZxEE/lRZyZnHDmmaVgVSp53fzOo9TS6Hw==
+  dependencies:
+    "@codemirror/gutter" "^0.17.0"
+    "@codemirror/language" "^0.17.0"
+    "@codemirror/rangeset" "^0.17.0"
+    "@codemirror/state" "^0.17.0"
+    "@codemirror/view" "^0.17.0"
+
+"@codemirror/gutter@^0.17.0":
+  version "0.17.1"
+  resolved "https://registry.yarnpkg.com/@codemirror/gutter/-/gutter-0.17.1.tgz#93fbefde25745d2e13b850718819ece0c7adc912"
+  integrity sha512-lSOz2cWZlwKu6F4r1aqDe3c3UdF/XowemAYP6Hlf30TT1J+qw/wS1p99orVFQMDr0GeQb1Q2TnqBNuzJ15eIxA==
+  dependencies:
+    "@codemirror/rangeset" "^0.17.0"
+    "@codemirror/state" "^0.17.0"
+    "@codemirror/view" "^0.17.0"
+
+"@codemirror/highlight@^0.17.0":
+  version "0.17.1"
+  resolved "https://registry.yarnpkg.com/@codemirror/highlight/-/highlight-0.17.1.tgz#621787bab19f384e8f32aca9bac9f73c46b6a507"
+  integrity sha512-SQb6vJ1DKqalDrmALppSj4f0ByzQZAxWgog4q//g82N2v48c+tub0STCIOGRPcyzknUvfMkWH1MCpXlxYpj/+g==
+  dependencies:
+    "@codemirror/language" "^0.17.0"
+    "@codemirror/rangeset" "^0.17.0"
+    "@codemirror/state" "^0.17.0"
+    "@codemirror/view" "^0.17.0"
+    lezer-tree "^0.13.0"
+    style-mod "^3.2.0"
+
+"@codemirror/history@^0.17.0":
+  version "0.17.1"
+  resolved "https://registry.yarnpkg.com/@codemirror/history/-/history-0.17.1.tgz#12d03af103faf1fc815eea08de488831c0d6f4f7"
+  integrity sha512-fYUMjcmfU6n5byyQm3ZLT0KzbuRduDCyHBoY02zP7e/Kf0Q5CepgNOyMvZBHnCw2mNf4fX6QcOzdfoidMC+ZPw==
   dependencies:
-    crelt "^1.0.5"
+    "@codemirror/state" "^0.17.0"
+    "@codemirror/view" "^0.17.0"
+
+"@codemirror/language@^0.17.0":
+  version "0.17.2"
+  resolved "https://registry.yarnpkg.com/@codemirror/language/-/language-0.17.2.tgz#564d176faefa5302be834a5a8f5b1044a95d8048"
+  integrity sha512-mcAj5qDhv7GE9jpAwUB0ewfRPj0LuoUv4gMRnCraxpKeMUF0BAxr2zXCWt7JKEXYLmueJ7QEjMk8vRaArOXxTQ==
+  dependencies:
+    "@codemirror/state" "^0.17.0"
+    "@codemirror/text" "^0.17.0"
+    "@codemirror/view" "^0.17.0"
     lezer "^0.13.0"
-    lezer-cpp "^0.13.0"
-    lezer-css "^0.13.0"
-    lezer-html "^0.13.0"
-    lezer-java "^0.13.0"
-    lezer-javascript "^0.13.0"
-    lezer-json "^0.13.0"
-    lezer-markdown "^0.13.0"
-    lezer-python "^0.13.0"
-    lezer-rust "^0.13.0"
     lezer-tree "^0.13.0"
-    lezer-xml "^0.13.0"
+
+"@codemirror/lint@^0.17.0":
+  version "0.17.1"
+  resolved "https://registry.yarnpkg.com/@codemirror/lint/-/lint-0.17.1.tgz#970dbfdb52cef35ff0210d22230dbff1c7dab7a4"
+  integrity sha512-Jzhf3g+hIr8frQaLsRSYJgM3BFVt7qQ59J0l/oqkjx8LsqYn0zbCM6zHnKMC0lOUdZXf7O8D24jTmVJb/8n4YQ==
+  dependencies:
+    "@codemirror/panel" "^0.17.0"
+    "@codemirror/state" "^0.17.0"
+    "@codemirror/tooltip" "^0.17.0"
+    "@codemirror/view" "^0.17.0"
+    crelt "^1.0.5"
+
+"@codemirror/matchbrackets@^0.17.0":
+  version "0.17.2"
+  resolved "https://registry.yarnpkg.com/@codemirror/matchbrackets/-/matchbrackets-0.17.2.tgz#9dd72046d7bf09550612b2553c41317ed22577b1"
+  integrity sha512-E4TP7lNXk7VtmvvKYH59yNx0lf5ubv7iv0Ok0uWCjxm+RIPnXiOdRoNI7rxITJcgNROOyKnuKsd6AAnmuXxDEQ==
+  dependencies:
+    "@codemirror/language" "^0.17.0"
+    "@codemirror/state" "^0.17.0"
+    "@codemirror/view" "^0.17.0"
+    lezer-tree "^0.13.0"
+
+"@codemirror/panel@^0.17.0":
+  version "0.17.1"
+  resolved "https://registry.yarnpkg.com/@codemirror/panel/-/panel-0.17.1.tgz#9dfd3b464c537caebec43fffbd8a283b0210d4c1"
+  integrity sha512-2it2Sk02eF4WFwPVoRLhr9lPGq9lwwwHZFyb4olqI6tOyTPwk6leZ4ntabYrhvjRc7gD6S6vM14KhOtjm4hjqg==
+  dependencies:
+    "@codemirror/state" "^0.17.0"
+    "@codemirror/view" "^0.17.0"
+
+"@codemirror/rangeset@^0.17.0":
+  version "0.17.1"
+  resolved "https://registry.yarnpkg.com/@codemirror/rangeset/-/rangeset-0.17.1.tgz#41066bcf4b70b2c7595cb1363780688cc3f1235b"
+  integrity sha512-Qv8a8C5CZiUdXGvxniWdULJzXDiz5uSP5ddHFEmekGa9nNVCgdr05nH7R+h3NgJ2P40UEEOPykqXZyy8EHGggw==
+  dependencies:
+    "@codemirror/state" "^0.17.0"
+
+"@codemirror/rectangular-selection@^0.17.0":
+  version "0.17.1"
+  resolved "https://registry.yarnpkg.com/@codemirror/rectangular-selection/-/rectangular-selection-0.17.1.tgz#c30a99664a8a5d525087f953815b6779a645fce3"
+  integrity sha512-mM6LjEiwcnj/NArVMTfMATuO35FDF9B1xCrqMlXTB/KxCXwFcGO/r8AccBV+ehR2Y+k7zlvfNvEVNi1SjP1Hfg==
+  dependencies:
+    "@codemirror/state" "^0.17.0"
+    "@codemirror/text" "^0.17.0"
+    "@codemirror/view" "^0.17.0"
+
+"@codemirror/search@^0.17.0":
+  version "0.17.1"
+  resolved "https://registry.yarnpkg.com/@codemirror/search/-/search-0.17.1.tgz#eb6ae529093b09f92b1d62c4d0ad8d09c4e218f7"
+  integrity sha512-wY0KP9my/0uKQk9AU39EqmkY6zMVv2Erej5b1rRBksM78JZXzjNUl4gyhtx1/0om84IZ1ocmW8MRElkAY6r1rw==
+  dependencies:
+    "@codemirror/panel" "^0.17.0"
+    "@codemirror/rangeset" "^0.17.0"
+    "@codemirror/state" "^0.17.0"
+    "@codemirror/text" "^0.17.0"
+    "@codemirror/view" "^0.17.0"
+    crelt "^1.0.5"
+
+"@codemirror/state@^0.17.0":
+  version "0.17.1"
+  resolved "https://registry.yarnpkg.com/@codemirror/state/-/state-0.17.1.tgz#ef8db9af29a4485572d380237df5bb0b4d50e7d5"
+  integrity sha512-ELgxzackFVC+wBWpGJGFN6OJ+uIdHrgj4BEh6qooju7U5Mdd1bM594QPGzNMRu3uXjfGj7ANHTATRPc0nnQRfA==
+  dependencies:
+    "@codemirror/text" "^0.17.0"
+
+"@codemirror/text@^0.17.0":
+  version "0.17.2"
+  resolved "https://registry.yarnpkg.com/@codemirror/text/-/text-0.17.2.tgz#7076feeaed16556b52d9b028429296ce10eb1280"
+  integrity sha512-KL+cM+uJPW5skyuTRoW43lOaSQq3YDNEPx5z0V/9Wsz9R9dK4kVP5NIRMUFgl9MUCQ9UxIotvgPDpz65j9wjuA==
+
+"@codemirror/tooltip@^0.17.0":
+  version "0.17.1"
+  resolved "https://registry.yarnpkg.com/@codemirror/tooltip/-/tooltip-0.17.1.tgz#e1ea8171ab49afa6aad478e83f698e7e8d7ccd13"
+  integrity sha512-qI0/rcXAelp9T+ZAfyUYmQmMjzKaIKonGehIfdL/GpyekfiCkFevxboCkMNYtsvHYOHflOAAB3zRF7Y0FkTukA==
+  dependencies:
+    "@codemirror/state" "^0.17.0"
+    "@codemirror/view" "^0.17.0"
+
+"@codemirror/view@^0.17.0":
+  version "0.17.3"
+  resolved "https://registry.yarnpkg.com/@codemirror/view/-/view-0.17.3.tgz#feb4482db91e1e612d334dfbf690de7c2a0c7732"
+  integrity sha512-Mrp+BLIZWCi08q+ewGa2YmYD2RcWr1htu91xDd+JSjTfKsQQ0RZq2q72h05KmhZNSS/+rJepWWdLghCa2urRCQ==
+  dependencies:
+    "@codemirror/rangeset" "^0.17.0"
+    "@codemirror/state" "^0.17.0"
+    "@codemirror/text" "^0.17.0"
     style-mod "^3.2.0"
     w3c-keyname "^2.2.4"
 
@@ -349,89 +511,18 @@ [email protected]:
   dependencies:
     lezer "^0.13.0"
 
-lezer-cpp@^0.13.0:
-  version "0.13.1"
-  resolved "https://registry.yarnpkg.com/lezer-cpp/-/lezer-cpp-0.13.1.tgz#c0e2c0a4d52cabbca325228defb3c22c07224edc"
-  integrity sha512-z2L6t8rNaT482fGdca6o86zJat6Nhmt2GJeSeFXKiIjZFpOpPJzm91hHhNzhb31kjs75dq0kCDv1N9fEJrtqng==
-  dependencies:
-    lezer "^0.13.0"
-
-lezer-css@^0.13.0:
-  version "0.13.1"
-  resolved "https://registry.yarnpkg.com/lezer-css/-/lezer-css-0.13.1.tgz#272582af7616318a7e0b6432fdf943c35499c96b"
-  integrity sha512-ke56tjG17IZ+EFiY50P2WinjhgZQB7OecRVZmYQbVuwv5iUdLemA4vLjaFsAbgoSg+4pfOms7Ns9nItoJcmFpg==
-  dependencies:
-    lezer "^0.13.0"
-
 lezer-generator@^0.13.0:
   version "0.13.1"
   resolved "https://registry.yarnpkg.com/lezer-generator/-/lezer-generator-0.13.1.tgz#99bd9f84658340c3241b5274c263bc17ba630578"
   integrity sha512-nc6llt59M/2N1cwieqN5UUBwmQ34oi5VxvsYxi0GzP7p+g9ZEhBbXFNjkDSyzz57dks+IgAC2yc5YRCmDMu7nQ==
   dependencies:
     lezer "^0.13.0"
 
-lezer-html@^0.13.0:
-  version "0.13.1"
-  resolved "https://registry.yarnpkg.com/lezer-html/-/lezer-html-0.13.1.tgz#eb7e215fb1d18f1954d46d3c2bd43638edd76655"
-  integrity sha512-ss4/dwfT7DL/vYeFlQZi0ztXi8R+IUv6nXRHbDCRPVQL5ZnrYw1tUT7y4DvU+haXjEnuQFR70zX/6SilSdXvxA==
-  dependencies:
-    lezer "^0.13.0"
-
-lezer-java@^0.13.0:
-  version "0.13.1"
-  resolved "https://registry.yarnpkg.com/lezer-java/-/lezer-java-0.13.1.tgz#79a5fffdde7a4bde79058a44544e13b22297c35f"
-  integrity sha512-4VJSPztvjAumWRANLN09m8BJfrAqErW2DXnxkEcGmV2Rgr5IoHDT3NDXJMGQmJXO5Shw0vpWIj2sCR+tdI/Kgw==
-  dependencies:
-    lezer "^0.13.0"
-
-lezer-javascript@^0.13.0:
-  version "0.13.1"
-  resolved "https://registry.yarnpkg.com/lezer-javascript/-/lezer-javascript-0.13.1.tgz#ec8be1f31ba84a3c7bdad0322b0f9b9c06da72cf"
-  integrity sha512-aECnPTtNyy7fwR36TKVx22lFP+5H1F+cAbMWkPtM95i3ShnxNzRfeZsh8VHljafsIBjLQzGlyYX0SY7gaSGk6w==
-  dependencies:
-    lezer "^0.13.0"
-
-lezer-json@^0.13.0:
-  version "0.13.1"
-  resolved "https://registry.yarnpkg.com/lezer-json/-/lezer-json-0.13.1.tgz#d48b272d4f4a6eefa8183d603aa22115f8ecd7ce"
-  integrity sha512-iXIXSjqa/+jmaDKD4yPgpwfwQlbOcu/IaFgZ+3dgo3oVtitEVlAJYcfw8g9ywJtae3CYQlyOX9mjyi0VCNPlNg==
-  dependencies:
-    lezer "^0.13.0"
-
-lezer-markdown@^0.13.0:
-  version "0.13.0"
-  resolved "https://registry.yarnpkg.com/lezer-markdown/-/lezer-markdown-0.13.0.tgz#cc98f7ee9aa83fd646b3282f1db24f2107970262"
-  integrity sha512-NrWO7skcqqWAr1ui8x1Sh1vMIYlE8re4bpMcno+8/V0zsjPSKgfFqNb9NB9tUK4PJpObJab7+VG1WmCncQrLUg==
-  dependencies:
-    lezer-html "^0.13.0"
-    lezer-tree "^0.13.0"
-
-lezer-python@^0.13.0:
-  version "0.13.1"
-  resolved "https://registry.yarnpkg.com/lezer-python/-/lezer-python-0.13.1.tgz#05e7faf03f62f47d9897e58a5e8e329d9bfd1a99"
-  integrity sha512-X/gOVWZ+29VcCN8t0P4AudvdeH46LUSeWPEbXK0Ka5DNBXltXAuXzxnofXdvcf7CvX6BvXU79tV1FH5BbCkl8w==
-  dependencies:
-    lezer "^0.13.0"
-
-lezer-rust@^0.13.0:
-  version "0.13.1"
-  resolved "https://registry.yarnpkg.com/lezer-rust/-/lezer-rust-0.13.1.tgz#f7ea63bcc1b20d8f6d9971b4b6079095081bcb2e"
-  integrity sha512-mn27bruCQfgKsyUV4vW/cUcUtZ0TjwNOFR299ZQxfxKSs4UUg0b6Jvu436ROYo5lxquKXf2BQdFWSttMoSlysg==
-  dependencies:
-    lezer "^0.13.0"
-
 lezer-tree@^0.13.0:
   version "0.13.0"
   resolved "https://registry.yarnpkg.com/lezer-tree/-/lezer-tree-0.13.0.tgz#199757338a30e4c5ee8d9a767546d7ce8935bfbe"
   integrity sha512-YqGD22WxQmT6np2JEX5Z+zhdBSfPEcQ8B6ct+39oLzSAHecUPUd/maN5PKNtnUZbSzd81mEx1ZqzMDA1eRSRcg==
 
-lezer-xml@^0.13.0:
-  version "0.13.1"
-  resolved "https://registry.yarnpkg.com/lezer-xml/-/lezer-xml-0.13.1.tgz#13cebef9cc3391429643a6fef10e0f361a88daf7"
-  integrity sha512-nY4hvqF/ISC6clG3hvyBmw51bbmw7syttTOFOCOOHs+GKr0WncUZA7t+K3wGmI51+zBcT4nrxuYXvBB/kkCKdw==
-  dependencies:
-    lezer "^0.13.0"
-
 lezer@^0.13.0, lezer@^0.13.1:
   version "0.13.1"
   resolved "https://registry.yarnpkg.com/lezer/-/lezer-0.13.1.tgz#95c8a4e9ad96bae567dff477bdf93b5f1d66f87d"