diff --git a/docker/devenv/Dockerfile b/docker/devenv/Dockerfile index 34285df04..9e90ed04d 100644 --- a/docker/devenv/Dockerfile +++ b/docker/devenv/Dockerfile @@ -3,10 +3,10 @@ LABEL maintainer="Andrey Antukh " ARG DEBIAN_FRONTEND=noninteractive -ENV NODE_VERSION=v14.16.0 \ +ENV NODE_VERSION=v14.16.1 \ CLOJURE_VERSION=1.10.3.822 \ - CLJKONDO_VERSION=2021.03.31 \ - BABASHKA_VERSION=0.3.2 \ + CLJKONDO_VERSION=2021.04.23 \ + BABASHKA_VERSION=0.3.5 \ LANG=en_US.UTF-8 \ LC_ALL=en_US.UTF-8 @@ -50,6 +50,9 @@ RUN set -ex; \ nginx \ jq \ redis-tools \ + woff-tools \ + woff2 \ + fontforge \ ; \ rm -rf /var/lib/apt/lists/*; @@ -95,7 +98,7 @@ RUN set -ex; \ rm -rf /var/lib/apt/lists/*; RUN set -ex; \ - curl -LfsSo /tmp/openjdk.tar.gz https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16%2B36/OpenJDK16-jdk_x64_linux_hotspot_16_36.tar.gz; \ + curl -LfsSo /tmp/openjdk.tar.gz https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16.0.1%2B9/OpenJDK16U-jdk_x64_linux_hotspot_16.0.1_9.tar.gz; \ mkdir -p /usr/lib/jvm/openjdk16; \ cd /usr/lib/jvm/openjdk16; \ tar -xf /tmp/openjdk.tar.gz --strip-components=1; \ diff --git a/docker/devenv/files/nginx.conf b/docker/devenv/files/nginx.conf index 174311229..eefd05cd0 100644 --- a/docker/devenv/files/nginx.conf +++ b/docker/devenv/files/nginx.conf @@ -129,6 +129,7 @@ http { location / { add_header Cache-Control "no-cache, max-age=0"; + proxy_pass http://127.0.0.1:8888; } } } diff --git a/frontend/deps.edn b/frontend/deps.edn index bb86cf042..4a3337c6a 100644 --- a/frontend/deps.edn +++ b/frontend/deps.edn @@ -1,53 +1,9 @@ {:paths ["src" "vendor" "resources" "../common"] - :deps - {org.clojure/clojurescript {:mvn/version "1.10.844"} - org.clojure/clojure {:mvn/version "1.10.3"} - com.cognitect/transit-cljs {:mvn/version "0.8.264"} - - environ/environ {:mvn/version "1.2.0"} - metosin/reitit-core {:mvn/version "0.5.12"} - expound/expound {:mvn/version "0.8.9"} - - danlentz/clj-uuid {:mvn/version "0.1.9"} - frankiesardo/linked {:mvn/version "1.3.0"} - - funcool/beicon {:mvn/version "2021.04.12-1"} - funcool/cuerdas {:mvn/version "2020.03.26-3"} - funcool/okulary {:mvn/version "2020.04.14-0"} - funcool/potok {:mvn/version "3.2.0"} - funcool/promesa {:mvn/version "6.0.0"} - funcool/rumext {:mvn/version "2021.01.26-0"} - - lambdaisland/uri {:mvn/version "1.4.54" - :exclusions [org.clojure/data.json]} - - instaparse/instaparse {:mvn/version "1.4.10"} - - } + :deps {} :aliases - {:dev - {:extra-paths ["tests" "dev"] - :extra-deps - {com.bhauman/rebel-readline-cljs {:mvn/version "0.1.4"} - com.bhauman/rebel-readline {:mvn/version "0.1.4"} - org.clojure/tools.namespace {:mvn/version "1.1.0"} - hashp/hashp {:mvn/version "RELEASE"} - - metosin/jsonista {:mvn/version "0.3.1"} - funcool/datoteka {:mvn/version "1.2.0"} - binaryage/devtools {:mvn/version "RELEASE"} - thheller/shadow-cljs {:mvn/version "2.12.5"} - - ;; i18n parsing - carocad/parcera {:mvn/version "0.11.6"} - org.antlr/antlr4-runtime {:mvn/version "4.9.2"}}} - - :outdated - {:extra-deps {com.github.liquidz/antq {:mvn/version "RELEASE"}} + {:outdated + {:extra-deps {com.github.liquidz/antq {:mvn/version "RELEASE"} + org.slf4j/slf4j-nop {:mvn/version "RELEASE"}} :main-opts ["-m" "antq.core"]} - - :repl - {:main-opts ["-m" "rebel-readline.main"]} - }} diff --git a/frontend/shadow-cljs.edn b/frontend/shadow-cljs.edn index e8fd91070..22093d0ee 100644 --- a/frontend/shadow-cljs.edn +++ b/frontend/shadow-cljs.edn @@ -1,8 +1,33 @@ -{:deps {:aliases [:dev]} - :http {:port 3448} +{:http {:port 3448} :nrepl {:port 3447} :jvm-opts ["-Xmx700m" "-Xms100m" "-XX:+UseSerialGC"] + :source-paths ["src", "vendor", "resources", "../common"] + + :dev-http {8888 "classpath:public"} + + :dependencies + [[binaryage/devtools "RELEASE"] + + [environ/environ "1.2.0"] + [metosin/reitit-core "0.5.12"] + [expound/expound "0.8.9"] + + [danlentz/clj-uuid "0.1.9"] + [frankiesardo/linked "1.3.0"] + + [funcool/beicon "2021.04.12-1"] + [funcool/cuerdas "2020.03.26-3"] + [funcool/okulary "2020.04.14-0"] + [funcool/potok "3.2.0"] + [funcool/promesa "6.0.0"] + [funcool/rumext "2021.01.26-0"] + + [lambdaisland/uri "1.4.54" + :exclusions [org.clojure/data.json]] + + [instaparse/instaparse "1.4.10"]] + :builds {:main {:target :browser