Skip to content

Commit

Permalink
Regenerate yarn.lock (#694)
Browse files Browse the repository at this point in the history
Upgrades js packages and fixes issues around multiple codemirror state instances being present.
  • Loading branch information
mk authored Oct 4, 2024
1 parent 1cd5694 commit 93e2194
Show file tree
Hide file tree
Showing 5 changed files with 129 additions and 1,203 deletions.
2 changes: 1 addition & 1 deletion bb.edn
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@
test:clj {:doc "Run clojure tests"
:task (apply clojure "-X:test" *command-line-args*)}

playwright:version {:doc "Print used playwright version from ui_tests/package-lock.json"
playwright:version {:doc "Print used playwright version from ui_tests/yarn.json"
:task (print (->> (babashka.process/shell {:out :string} "grep -E 'playwright-core \"(.*)\"' ui_tests/yarn.lock")
:out
str/trim
Expand Down
7 changes: 3 additions & 4 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
"@nextjournal/lezer-clojure": "1.0.0",
"d3-require": "^1.2.4",
"emoji-regex": "^10.0.0",
"fraction.js": "4.2.1",
"framer-motion": "^10.12.16",
"katex": "^0.12.0",
"lezer-clojure": "1.0.0-rc.2",
Expand All @@ -26,6 +27,7 @@
"markdown-it-footnote": "^3.0.3",
"markdown-it-texmath": "^1.0.0",
"markdown-it-toc-done-right": "^4.2.0",
"odex": "3.0.0-rc.4",
"punycode": "2.1.1",
"react": "^18.2.0",
"react-dom": "^18.2.0",
Expand All @@ -34,9 +36,6 @@
"w3c-keyname": "2.2.4"
},
"devDependencies": {
"@tailwindcss/typography": "^0.5.0",
"postcss": "^8.4.5",
"shadow-cljs": "^2.16.7",
"tailwindcss": "^3.0.9"
"process": "^0.11.10"
}
}
2 changes: 1 addition & 1 deletion src/nextjournal/clerk/render/code.cljs
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@
(concat [(.sliceString text pos to)]))))))))

(defn import-matching-language-parser [language]
(.. (shadow.esm/dynamic-import "https://cdn.skypack.dev/@codemirror/language-data@6.1.0")
(.. (shadow.esm/dynamic-import "https://cdn.skypack.dev/@codemirror/language-data@6.5.1")
(then (fn [^js mod]
(when-some [langs (.-languages mod)]
(when-some [^js matching (or (.matchLanguageName LanguageDescription langs language)
Expand Down
2 changes: 1 addition & 1 deletion ui_tests/playwright_tests.cljs
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@
(p/delay 30000) ;; allow errors to be logged to console
(is (zero? (count @console-errors))
(str/join "\n" (map (fn [{:keys [msg notebook]}]
[(.text msg) (.location msg) notebook])
[msg notebook])
@console-errors))))
(.catch (fn [err]
(js/console.log err)
Expand Down
Loading

0 comments on commit 93e2194

Please sign in to comment.