Skip to content

Commit

Permalink
use shadow 2.24.1 to fix jsxgraph issue
Browse files Browse the repository at this point in the history
  • Loading branch information
mhuebert committed Jul 28, 2023
1 parent 101c16e commit 9255323
Show file tree
Hide file tree
Showing 5 changed files with 10 additions and 12 deletions.
1 change: 0 additions & 1 deletion editor2/bb.edn
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,5 @@
css (shell "npx tailwindcss -i src/maria.cloud.css -o public/maria.cloud.css")
release (do (run 'copy-curriculum)
(shell "yarn shadow-cljs release editor")
(prn :public (shell "ls public"))
(run 'css))
debug (shell "yarn shadow-cljs release editor --debug")}}
5 changes: 2 additions & 3 deletions editor2/deps.edn
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
{:paths ["src/main"]
:deps {org.clojure/clojure {:mvn/version "1.11.1"}
org.clojure/clojurescript {:mvn/version "1.11.60"}
thheller/shadow-cljs {:mvn/version "2.25.1"}
:deps {thheller/shadow-cljs {:mvn/version "2.24.1"}
org.clojure/clojure {:mvn/version "1.12.0-alpha3"}
applied-science/js-interop {#_#_:mvn/version "0.4.1"
:git/url "https://github.com/applied-science/js-interop"
:git/sha "e29e17b2a647006ac0e96307bbc893b01b99c3e9"}
Expand Down
4 changes: 2 additions & 2 deletions editor2/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
"firebase": "^9.19.1",
"fraction.js": "^4.2.0",
"framer-motion": "^7.5.1",
"jsxgraph": "^1.4.6",
"jsxgraph": "^1.5.0",
"jszip": "^3.10.1",
"katex": "^0.16.2",
"leva": "^0.9.35",
Expand Down Expand Up @@ -69,7 +69,7 @@
"react": "^18.2.0",
"react-dom": "^18.2.0",
"react-refresh": "^0.14.0",
"shadow-cljs": "^2.20.1",
"shadow-cljs": "^2.24.1",
"tailwindcss": "^3.3.1",
"three": "^0.154.0",
"threestrap": "0.5.1",
Expand Down
2 changes: 1 addition & 1 deletion editor2/shadow-cljs.edn
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
"/index.html" (maria.cloud.build/index-html)})]
:dev {:build-hooks [(maria.cloud.build/tailwind-watch!)
(maria.cloud.build/copy-curriculum!)]}
:release {:build-hooks [(shadow.cljs.build-report/hook {:output-to "public/report.html"})]}
#_#_:release {:build-hooks [(shadow.cljs.build-report/hook {:output-to "public/report.html"})]}
:devtools {:http-root "public"
:http-port 8000
:preloads [yawn.view.refresh-preload]}
Expand Down
10 changes: 5 additions & 5 deletions editor2/yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -4423,7 +4423,7 @@ jsprim@^1.2.2:
json-schema "0.4.0"
verror "1.10.0"

jsxgraph@^1.4.6:
jsxgraph@^1.5.0:
version "1.5.0"
resolved "https://registry.yarnpkg.com/jsxgraph/-/jsxgraph-1.5.0.tgz#21b4cc7e0f899490e676d668b49e0594498b9d00"
integrity sha512-mXsW1LG9AEZpiYDM+nScs5G5ZKw6xrQIrVLszRXeXFX+XYbS1Abx9oMmk7WMDbCXerYFzNo5/vZ9MRZpFeABpQ==
Expand Down Expand Up @@ -6389,10 +6389,10 @@ shadow-cljs-jar@1.3.4:
resolved "https://registry.yarnpkg.com/shadow-cljs-jar/-/shadow-cljs-jar-1.3.4.tgz#0939d91c468b4bc5eab5a958f79e7ef5696fdf62"
integrity sha512-cZB2pzVXBnhpJ6PQdsjO+j/MksR28mv4QD/hP/2y1fsIa9Z9RutYgh3N34FZ8Ktl4puAXaIGlct+gMCJ5BmwmA==

shadow-cljs@^2.20.1:
version "2.22.10"
resolved "https://registry.yarnpkg.com/shadow-cljs/-/shadow-cljs-2.22.10.tgz#0ba40dc48f403a9b0db6541f7563d5b933cc4903"
integrity sha512-a8d0d4HA+OPyAiy+OpeXiqvmfLcidODsJ/rnxF13D1jevGxAmFKfF3IedCtf4PRRzIRIrsvOhwZnrSFc0ykZ3w==
shadow-cljs@^2.25.1:
version "2.25.1"
resolved "https://registry.yarnpkg.com/shadow-cljs/-/shadow-cljs-2.25.1.tgz#e84f73dde5870d4a86f568846cca2e2c23b05032"
integrity sha512-DM+nUovgZLLFBNX4zuOzmsRPAO5goiwl6aGnC0MJfxjHvYS+9BsPqGwx6VJn4ErNJP5nPFQybAL3fH3lwLDGLQ==
dependencies:
node-libs-browser "^2.2.1"
readline-sync "^1.4.7"
Expand Down

0 comments on commit 9255323

Please # to comment.