Skip to content

Commit d32d56f

Browse files
borkdudeborkdude
authored
Upgrade shadow, squint and clerk (#59)
* Upgrade shadow, squint and clerk * revert clerk update * v0.8.129
1 parent d42c746 commit d32d56f

File tree

6 files changed

+49
-124
lines changed

6 files changed

+49
-124
lines changed

‎deps.edn

+5-4
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,18 @@
11
{:paths ["src-shared" "src"]
22
:deps {applied-science/js-interop {:mvn/version "0.3.3"}
3-
org.clojure/clojure {:mvn/version "1.10.3"}
4-
org.clojure/clojurescript {:mvn/version "1.10.866"}}
3+
org.clojure/clojure {:mvn/version "1.12.0"}
4+
org.clojure/clojurescript {:mvn/version "1.11.132"}}
55
:aliases
66
{:dev {:extra-paths ["test"]
7-
:extra-deps {thheller/shadow-cljs {:mvn/version "2.14.4"}}}
7+
:extra-deps {thheller/shadow-cljs {:mvn/version "2.28.20"}}}
88

99
:demo {:extra-paths ["demo/src" "demo/notebooks"]
1010
:jvm-opts ["-Dpolyglot.engine.WarnInterpreterOnly=false"]
1111
:extra-deps {org.babashka/sci {:mvn/version "0.3.5"}
1212
reagent/reagent {:mvn/version "1.1.1"}
1313
io.github.nextjournal/clerk {#_#_ :local/root "../clerk"
14-
:git/sha "2fbd6f08fea2f736faae2e0cc46c435dce8a23f0"}
14+
:git/sha "2fbd6f08fea2f736faae2e0cc46c435dce8a23f0"
15+
#_#_:mvn/version "0.17.1102"}
1516
;; clerk dev deps
1617
io.github.babashka/sci.configs {:git/sha "ec570cdfb2c627d0cd280a899cd915d0e89d8f7b"}
1718
io.github.nextjournal/viewers {:git/sha "f4a32b05ff4382a85a3dcf66cdec89c2389ac3c8"

‎package.json

+4-2
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,8 @@
2323
"@lezer/highlight": "^1.0.0",
2424
"@lezer/lr": "^1.0.0",
2525
"@nextjournal/lezer-clojure": "1.0.0",
26-
"squint-cljs": "0.7.111",
26+
"markdown-it-footnote": "^3.0.3",
27+
"squint-cljs": "0.8.129",
2728
"w3c-keyname": "^2.2.4"
2829
},
2930
"comments": {
@@ -59,6 +60,7 @@
5960
},
6061
"exports": {
6162
".": "./dist/nextjournal/clojure_mode.mjs",
62-
"./extensions/eval-region": "./dist/nextjournal/clojure_mode/extensions/eval_region.mjs"
63+
"./extensions/eval-region": "./dist/nextjournal/clojure_mode/extensions/eval_region.mjs",
64+
"./extensions/formatting": "./dist/nextjournal/clojure_mode/extensions/formatting.mjs"
6365
}
6466
}

‎public/squint/index.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -436,7 +436,7 @@
436436
<script type="importmap">
437437
{
438438
"imports": {
439-
"squint-cljs/core.js": "https://unpkg.com/squint-cljs@0.4.81/core.js"
439+
"squint-cljs/core.js": "https://unpkg.com/squint-cljs@0.8.129/core.js"
440440
}
441441
}
442442
</script>

‎src-shared/nextjournal/clojure_mode.cljc

+17-16
Original file line numberDiff line numberDiff line change
@@ -21,22 +21,23 @@
2121
:List coll-span})))
2222

2323
(def style-tags
24-
(clj->js {:NS (.-keyword tags)
25-
:DefLike (.-keyword tags)
26-
"Operator/Symbol" (.-keyword tags)
27-
"VarName/Symbol" (.definition tags (.-variableName tags))
28-
:Boolean (.-atom tags)
29-
"DocString/..." (.-emphasis tags)
30-
:Discard! (.-comment tags)
31-
:Number (.-number tags)
32-
:StringContent (.-string tags)
33-
;; need to pass something, that returns " when being parsed as JSON
34-
;; also #js doesn't treat this correctly, hence clj->js above
35-
"\"\\\"\"" (.-string tags)
36-
:Keyword (.-atom tags)
37-
:Nil (.-null tags)
38-
:LineComment (.-lineComment tags)
39-
:RegExp (.-regexp tags)}))
24+
(clj->js
25+
{:NS (.-keyword tags)
26+
:DefLike (.-keyword tags)
27+
"Operator/Symbol" (.-keyword tags)
28+
"VarName/Symbol" (.definition tags (.-variableName tags))
29+
:Boolean (.-atom tags)
30+
"DocString/..." (.-emphasis tags)
31+
:Discard! (.-comment tags)
32+
:Number (.-number tags)
33+
:StringContent (.-string tags)
34+
;; need to pass something, that returns " when being parsed as JSON
35+
;; also #js doesn't treat this correctly, hence clj->js above
36+
"\"\\\"\"" (.-string tags)
37+
:Keyword (.-atom tags)
38+
:Nil (.-null tags)
39+
:LineComment (.-lineComment tags)
40+
:RegExp (.-regexp tags)}))
4041

4142
(def parser lezer-clj/parser)
4243

‎src-shared/nextjournal/clojure_mode/util.cljc

+2-1
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,8 @@
5858
from-to
5959
range
6060
changes]} (guard update-map map?)
61-
change-desc (when changes (.changes state (clj->js changes)))]
61+
change-desc (when changes (.changes state (-> changes
62+
clj->js)))]
6263
(cond-> #js{:range (or range
6364
(cond mapped (sel/cursor (.mapPos change-desc mapped))
6465
cursor (sel/cursor cursor)

‎yarn.lock

+20-100
Original file line numberDiff line numberDiff line change
@@ -321,14 +321,6 @@
321321
resolved "https://registry.yarnpkg.com/@squint-cljs/macros/-/macros-0.1.0.tgz#38259e429222c8f01acc93f3eae3df8a2e10f24c"
322322
integrity sha512-VVwgcprJxItnITWZA5n32iUCI41S9n5WiZCQrC2uh314L/MU+7w3E7cjCp+mBygKhJL80U1VCFchY9ra1Z+6Zg==
323323

324-
anymatch@~3.1.2:
325-
version "3.1.3"
326-
resolved "https://registry.yarnpkg.com/anymatch/-/anymatch-3.1.3.tgz#790c58b19ba1720a84205b57c618d5ad8524973e"
327-
integrity sha512-KMReFUr0B4t+D+OBkjR3KYqvocp2XaSzO55UcB6mgQMd3KbcE+mWTyvVV7D/zsdEbNnV6acZUutkiHQXvTr1Rw==
328-
dependencies:
329-
normalize-path "^3.0.0"
330-
picomatch "^2.0.4"
331-
332324
argparse@^2.0.1:
333325
version "2.0.1"
334326
resolved "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz"
@@ -356,11 +348,6 @@ base64-js@^1.0.2:
356348
resolved "https://registry.npmjs.org/base64-js/-/base64-js-1.3.1.tgz"
357349
integrity sha512-mLQ4i2QO1ytvGWFWmcngKO//JXAQueZvwEKtjgQFM4jIK0kU+ytMfplL8j+n5mspOfjHwoAg+9yhb7BwAHm36g==
358350

359-
binary-extensions@^2.0.0:
360-
version "2.2.0"
361-
resolved "https://registry.yarnpkg.com/binary-extensions/-/binary-extensions-2.2.0.tgz#75f502eeaf9ffde42fc98829645be4ea76bd9e2d"
362-
integrity sha512-jDctJ/IVQbZoJykoeHbhXpOlNBqGNcwXJKJog42E5HDPUwQTSdjCHdihjj0DlnheQ7blbT6dHOafNAiS8ooQKA==
363-
364351
bn.js@^4.0.0, bn.js@^4.1.0, bn.js@^4.11.9:
365352
version "4.12.0"
366353
resolved "https://registry.npmjs.org/bn.js/-/bn.js-4.12.0.tgz"
@@ -371,13 +358,6 @@ bn.js@^5.1.1:
371358
resolved "https://registry.npmjs.org/bn.js/-/bn.js-5.1.2.tgz"
372359
integrity sha512-40rZaf3bUNKTVYu9sIeeEGOg7g14Yvnj9kH7b50EiwX0Q7A6umbvfI5tvHaOERH0XigqKkfLkFQxzb4e6CIXnA==
373360

374-
braces@~3.0.2:
375-
version "3.0.2"
376-
resolved "https://registry.yarnpkg.com/braces/-/braces-3.0.2.tgz#3454e1a462ee8d599e236df336cd9ea4f8afe107"
377-
integrity sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==
378-
dependencies:
379-
fill-range "^7.0.1"
380-
381361
brorand@^1.0.1, brorand@^1.1.0:
382362
version "1.1.0"
383363
resolved "https://registry.npmjs.org/brorand/-/brorand-1.1.0.tgz"
@@ -463,20 +443,12 @@ builtin-status-codes@^3.0.0:
463443
resolved "https://registry.npmjs.org/builtin-status-codes/-/builtin-status-codes-3.0.0.tgz"
464444
integrity sha1-hZgoeOIbmOHGZCXgPQF0eI9Wnug=
465445

466-
chokidar@^3.5.3:
467-
version "3.5.3"
468-
resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-3.5.3.tgz#1cf37c8707b932bd1af1ae22c0432e2acd1903bd"
469-
integrity sha512-Dr3sfKRP6oTcjf2JmUmFJfeVMvXBdegxB0iVQ5eb2V10uFJUCAS8OByZdVAyVb8xXNz3GjjTgj9kLWsZTqE6kw==
470-
dependencies:
471-
anymatch "~3.1.2"
472-
braces "~3.0.2"
473-
glob-parent "~5.1.2"
474-
is-binary-path "~2.1.0"
475-
is-glob "~4.0.1"
476-
normalize-path "~3.0.0"
477-
readdirp "~3.6.0"
478-
optionalDependencies:
479-
fsevents "~2.3.2"
446+
chokidar@^4.0.1:
447+
version "4.0.1"
448+
resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-4.0.1.tgz#4a6dff66798fb0f72a94f616abbd7e1a19f31d41"
449+
integrity sha512-n8enUVCED/KVRQlab1hr3MVpcVMvxtZjmEa956u+4YijlmQED223XMSYj2tLuKvr4jcCTzNNMpQDUer72MMmzA==
450+
dependencies:
451+
readdirp "^4.0.1"
480452

481453
cipher-base@^1.0.0, cipher-base@^1.0.1, cipher-base@^1.0.3:
482454
version "1.0.4"
@@ -650,13 +622,6 @@ evp_bytestokey@^1.0.0, evp_bytestokey@^1.0.3:
650622
md5.js "^1.3.4"
651623
safe-buffer "^5.1.1"
652624

653-
fill-range@^7.0.1:
654-
version "7.0.1"
655-
resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-7.0.1.tgz#1919a6a7c75fe38b2c7c77e5198535da9acdda40"
656-
integrity sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==
657-
dependencies:
658-
to-regex-range "^5.0.1"
659-
660625
framer-motion@^6.2.8:
661626
version "6.3.16"
662627
resolved "https://registry.npmjs.org/framer-motion/-/framer-motion-6.3.16.tgz"
@@ -682,13 +647,6 @@ fsevents@~2.3.2:
682647
resolved "https://registry.npmjs.org/fsevents/-/fsevents-2.3.3.tgz"
683648
integrity sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==
684649

685-
glob-parent@~5.1.2:
686-
version "5.1.2"
687-
resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-5.1.2.tgz#869832c58034fe68a4093c17dc15e8340d8401c4"
688-
integrity sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==
689-
dependencies:
690-
is-glob "^4.0.1"
691-
692650
hash-base@^3.0.0:
693651
version "3.1.0"
694652
resolved "https://registry.npmjs.org/hash-base/-/hash-base-3.1.0.tgz"
@@ -745,30 +703,6 @@ inherits@^2.0.1, inherits@^2.0.3, inherits@^2.0.4, inherits@~2.0.1, inherits@~2.
745703
resolved "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz"
746704
integrity sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==
747705

748-
is-binary-path@~2.1.0:
749-
version "2.1.0"
750-
resolved "https://registry.yarnpkg.com/is-binary-path/-/is-binary-path-2.1.0.tgz#ea1f7f3b80f064236e83470f86c09c254fb45b09"
751-
integrity sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==
752-
dependencies:
753-
binary-extensions "^2.0.0"
754-
755-
is-extglob@^2.1.1:
756-
version "2.1.1"
757-
resolved "https://registry.yarnpkg.com/is-extglob/-/is-extglob-2.1.1.tgz#a88c02535791f02ed37c76a1b9ea9773c833f8c2"
758-
integrity sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ==
759-
760-
is-glob@^4.0.1, is-glob@~4.0.1:
761-
version "4.0.3"
762-
resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-4.0.3.tgz#64f61e42cbbb2eec2071a9dac0b28ba1e65d5084"
763-
integrity sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==
764-
dependencies:
765-
is-extglob "^2.1.1"
766-
767-
is-number@^7.0.0:
768-
version "7.0.0"
769-
resolved "https://registry.yarnpkg.com/is-number/-/is-number-7.0.0.tgz#7535345b896734d5f80c4d06c50955527a14f12b"
770-
integrity sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==
771-
772706
isarray@^1.0.0, isarray@~1.0.0:
773707
version "1.0.0"
774708
resolved "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz"
@@ -810,6 +744,11 @@ [email protected]:
810744
resolved "https://registry.npmjs.org/markdown-it-block-image/-/markdown-it-block-image-0.0.3.tgz"
811745
integrity sha512-+esbdLegMSWmIRGwVncj5ZwVi5K1qt894uXfnkZIyMFC7ssbv7aR7YEVI16w0PdFWow1HmBNUZ4chl0vScjoIA==
812746

747+
markdown-it-footnote@^3.0.3:
748+
version "3.0.3"
749+
resolved "https://registry.yarnpkg.com/markdown-it-footnote/-/markdown-it-footnote-3.0.3.tgz#e0e4c0d67390a4c5f0c75f73be605c7c190ca4d8"
750+
integrity sha512-YZMSuCGVZAjzKMn+xqIco9d1cLGxbELHZ9do/TSYVzraooV8ypsppKNmUJ0fVH5ljkCInQAtFpm8Rb3eXSrt5w==
751+
813752
"markdown-it-sidenote@https://github.com/gerwitz/markdown-it-sidenote#aa5de8ce3168b7d41cb33c3aed071a5f41ce0083":
814753
version "0.2.0"
815754
resolved "https://github.com/gerwitz/markdown-it-sidenote#aa5de8ce3168b7d41cb33c3aed071a5f41ce0083"
@@ -901,11 +840,6 @@ node-libs-browser@^2.2.1:
901840
util "^0.11.0"
902841
vm-browserify "^1.0.1"
903842

904-
normalize-path@^3.0.0, normalize-path@~3.0.0:
905-
version "3.0.0"
906-
resolved "https://registry.yarnpkg.com/normalize-path/-/normalize-path-3.0.0.tgz#0dcd69ff23a1c9b11fd0978316644a0388216a65"
907-
integrity sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==
908-
909843
object-assign@^4.1.1:
910844
version "4.1.1"
911845
resolved "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz"
@@ -954,11 +888,6 @@ picocolors@^1.0.0:
954888
resolved "https://registry.npmjs.org/picocolors/-/picocolors-1.0.0.tgz"
955889
integrity sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ==
956890

957-
picomatch@^2.0.4, picomatch@^2.2.1:
958-
version "2.3.1"
959-
resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-2.3.1.tgz#3ba3833733646d9d3e4995946c1365a67fb07a42"
960-
integrity sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==
961-
962891
[email protected]:
963892
version "11.0.3"
964893
resolved "https://registry.npmjs.org/popmotion/-/popmotion-11.0.3.tgz"
@@ -1079,12 +1008,10 @@ readable-stream@^3.6.0:
10791008
string_decoder "^1.1.1"
10801009
util-deprecate "^1.0.1"
10811010

1082-
readdirp@~3.6.0:
1083-
version "3.6.0"
1084-
resolved "https://registry.yarnpkg.com/readdirp/-/readdirp-3.6.0.tgz#74a370bd857116e245b29cc97340cd431a02a6c7"
1085-
integrity sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA==
1086-
dependencies:
1087-
picomatch "^2.2.1"
1011+
readdirp@^4.0.1:
1012+
version "4.0.2"
1013+
resolved "https://registry.yarnpkg.com/readdirp/-/readdirp-4.0.2.tgz#388fccb8b75665da3abffe2d8f8ed59fe74c230a"
1014+
integrity sha512-yDMz9g+VaZkqBYS/ozoBJwaBhTbZo3UNYQHNRw1D3UFQB8oHB4uS/tAODO+ZLjGWmUbKnIlOWO+aaIiAxrUWHA==
10881015

10891016
readline-sync@^1.4.7:
10901017
version "1.4.10"
@@ -1176,12 +1103,12 @@ source-map@^0.5.6:
11761103
resolved "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz"
11771104
integrity sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=
11781105

1179-
squint-cljs@0.7.111:
1180-
version "0.7.111"
1181-
resolved "https://registry.yarnpkg.com/squint-cljs/-/squint-cljs-0.7.111.tgz#1441933ed7162d5590570875394c12b181db9427"
1182-
integrity sha512-BZSq3OxqdRN1xpIYBOWDI03tppaOLxtmapUDsS32ViKg2anu6fo44qh3qGAvXcapDwc1mkIS6A2y2GA+SgB2Rw==
1106+
squint-cljs@0.8.129:
1107+
version "0.8.129"
1108+
resolved "https://registry.yarnpkg.com/squint-cljs/-/squint-cljs-0.8.129.tgz#04a3f1ca899e6fb7e2ba30b882efb791741caff0"
1109+
integrity sha512-cgTKzOorBX2wuli+6BNnioPYslAqyGP+C4W5W/B2ddlBXCTUPfc9nCrxkz5hP1vOt6bPJNZDdKjcXkfRlO62/g==
11831110
dependencies:
1184-
chokidar "^3.5.3"
1111+
chokidar "^4.0.1"
11851112

11861113
stream-browserify@^2.0.1:
11871114
version "2.0.2"
@@ -1241,13 +1168,6 @@ to-arraybuffer@^1.0.0:
12411168
resolved "https://registry.npmjs.org/to-arraybuffer/-/to-arraybuffer-1.0.1.tgz"
12421169
integrity sha1-fSKbH8xjfkZsoIEYCDanqr/4P0M=
12431170

1244-
to-regex-range@^5.0.1:
1245-
version "5.0.1"
1246-
resolved "https://registry.yarnpkg.com/to-regex-range/-/to-regex-range-5.0.1.tgz#1648c44aae7c8d988a326018ed72f5b4dd0392e4"
1247-
integrity sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==
1248-
dependencies:
1249-
is-number "^7.0.0"
1250-
12511171
tslib@^2.1.0:
12521172
version "2.4.0"
12531173
resolved "https://registry.npmjs.org/tslib/-/tslib-2.4.0.tgz"

0 commit comments

Comments
 (0)