simon/mw-scittle
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'main' into bolivier/add-reframe

Browse source
This commit is contained in:
Michiel Borkent 2022-11-23 12:50:53 +01:00 • committed by GitHub
commit 94b8020b65
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 19 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

2
CHANGELOG.md
View file

@ -6,6 +6,8 @@
[re-frame](https://github.com/day8/re-frame) library. [re-frame](https://github.com/day8/re-frame) library.
- Fix for [44](https://github.com/babashka/scittle/issues/44): Honoring `SCITTLE_NREPL_WEBSOCKET_PORT` in `scittle.nrepl` - Fix for [44](https://github.com/babashka/scittle/issues/44): Honoring `SCITTLE_NREPL_WEBSOCKET_PORT` in `scittle.nrepl`
- Add all public vars of `cljs-ajax` `ajax.core`
- Upgrade several built-in libraries
## v0.3.10 ## v0.3.10

26
deps.edn
View file

@ -1,25 +1,25 @@
{:paths ["src" "resources"] {:paths ["src" "resources"]
:deps :deps
{org.clojure/clojure {:mvn/version "1.10.3"} {org.clojure/clojure {:mvn/version "1.11.1"}
org.babashka/sci {:git/url "https://github.com/babashka/sci" org.babashka/sci {:git/url "https://github.com/babashka/sci"
:git/sha "a201fd70567437e228359999ecdca337c3060b70"} :git/sha "914919f248b7e3fc2ec59c435320145f588899d0"}
#_{:local/root "../babashka/sci"} #_{:local/root "../babashka/sci"}
reagent/reagent {:mvn/version "1.1.0"} reagent/reagent {:mvn/version "1.1.1"}
re-frame/re-frame {:mvn/version "1.3.0"} re-frame/re-frame {:mvn/version "1.3.0"}
cljsjs/react {:mvn/version "17.0.2-0"} cljsjs/react {:mvn/version "18.2.0-1"}
cljsjs/react-dom {:mvn/version "17.0.2-0"} cljsjs/react-dom {:mvn/version "18.2.0-1"}
cljsjs/react-dom-server {:mvn/version "17.0.2-0"} cljsjs/react-dom-server {:mvn/version "18.2.0-1"}
cljs-ajax/cljs-ajax {:mvn/version "0.8.3"} cljs-ajax/cljs-ajax {:mvn/version "0.8.4"}
funcool/promesa {:mvn/version "8.0.450"} funcool/promesa {:mvn/version "9.1.540"}
io.github.babashka/sci.nrepl io.github.babashka/sci.nrepl
#_{:local/root "../sci.nrepl"} #_{:local/root "../sci.nrepl"}
{:git/sha "e83421ce9349c36df56a2eb936196dbb65b0de63"} {:git/url "https://github.com/babashka/sci.nrepl"
:git/sha "b75700da7797f9fc2b4ef1bef9df7230f9fd1e8c"}
io.github.babashka/sci.configs io.github.babashka/sci.configs
{:git/sha "2b60b749dfc4cc5fd21f0d8df9a853299e562372"}} {:git/url "https://github.com/babashka/sci.configs"
:git/sha "2717e545e5a61d4cccd85350b9ad6265afc9146c"}}
:aliases :aliases
{:dev {:dev
{:extra-paths ["dev"] {:extra-paths ["dev"]
:extra-deps {thheller/shadow-cljs {:mvn/version "2.14.0"}}}}} :extra-deps {thheller/shadow-cljs {:mvn/version "2.20.12"}}}}}

4
resources/public/index.html
View file

@ -3,8 +3,8 @@
<head> <head>
<link rel="stylesheet" href="css/style.css"> <link rel="stylesheet" href="css/style.css">
<script src="js/scittle.js" type="application/javascript"></script> <script src="js/scittle.js" type="application/javascript"></script>
<script crossorigin src="https://unpkg.com/react@17/umd/react.production.min.js"></script> <script crossorigin src="https://unpkg.com/react@18/umd/react.production.min.js"></script>
<script crossorigin src="https://unpkg.com/react-dom@17/umd/react-dom.production.min.js"></script> <script crossorigin src="https://unpkg.com/react-dom@18/umd/react-dom.production.min.js"></script>
<script src="js/scittle.reagent.js" type="application/javascript"></script> <script src="js/scittle.reagent.js" type="application/javascript"></script>
<script src="js/scittle.cljs-ajax.js" type="application/javascript"></script> <script src="js/scittle.cljs-ajax.js" type="application/javascript"></script>
<script src="js/scittle.pprint.js" type="application/javascript"></script> <script src="js/scittle.pprint.js" type="application/javascript"></script>

5
src/scittle/cljs_ajax.cljs
View file

@ -1,13 +1,12 @@
(ns scittle.cljs-ajax (ns scittle.cljs-ajax
(:require [ajax.core :as ajx] (:require [ajax.core]
[sci.core :as sci] [sci.core :as sci]
[scittle.core :as scittle])) [scittle.core :as scittle]))
(def ans (sci/create-ns 'ajax.core nil)) (def ans (sci/create-ns 'ajax.core nil))
(def ajax-namespace (def ajax-namespace
{'GET (sci/copy-var ajx/GET ans) (sci/copy-ns ajax.core ans))
'POST (sci/copy-var ajx/POST ans)})
(scittle/register-plugin! (scittle/register-plugin!
::ajax ::ajax