Skip to content

Commit

Permalink
updated deps to more recent versions
Browse files Browse the repository at this point in the history
  • Loading branch information
@awkay
awkay committed Jul 8, 2020
1 parent 0b15692 commit 6fe4351
Show file tree
Hide file tree
Showing 8 changed files with 2,524 additions and 64 deletions.
30 changes: 15 additions & 15 deletions deps.edn
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,35 +4,35 @@
bidi {:mvn/version "2.1.6"}
bk/ring-gzip {:mvn/version "0.3.0"}
com.taoensso/timbre {:mvn/version "4.10.0"}
com.taoensso/tufte {:mvn/version "2.1.0-RC4"}
com.wsscode/pathom {:mvn/version "2.2.26"}
com.fulcrologic/fulcro {:mvn/version "3.0.9"}
com.taoensso/tufte {:mvn/version "2.1.0"}
com.wsscode/pathom {:mvn/version "2.2.31"}
com.fulcrologic/fulcro {:mvn/version "3.2.11"}
com.fulcrologic/fulcro-garden-css {:mvn/version "3.0.7"}
com.fulcrologic/semantic-ui-wrapper {:mvn/version "1.0.0"}
com.fulcrologic/guardrails {:mvn/version "0.0.9"}
com.fulcrologic/semantic-ui-wrapper {:mvn/version "1.0.1"}
com.fulcrologic/guardrails {:mvn/version "0.0.12"}
garden {:mvn/version "1.3.9"}
hiccup {:mvn/version "1.0.5"}
http-kit {:mvn/version "2.3.0"}
mount {:mvn/version "0.1.12"}
org.clojure/core.async {:mvn/version "0.4.500"}
org.clojure/core.async {:mvn/version "1.2.603"}

;; To simulate Datomic on the back-end
datascript {:mvn/version "0.18.4"}
datascript {:mvn/version "0.18.7"}

ring/ring-core {:mvn/version "1.7.1"}
ring/ring-core {:mvn/version "1.8.1"}
ring/ring-defaults {:mvn/version "0.3.2"}}

:aliases {:clj-tests {:extra-paths ["src/test"]
:main-opts ["-m" "kaocha.runner"]
:extra-deps {lambdaisland/kaocha {:mvn/version "0.0-529"}}}
:extra-deps {lambdaisland/kaocha {:mvn/version "1.0.632"}}}

;; See https://github.com/clojure-emacs/cider-nrepl/blob/master/deps.edn for Emacs support
:dev {:extra-paths ["src/test" "src/dev" "src/workspaces"]
:jvm-opts ["-XX:-OmitStackTraceInFastThrow"]
:extra-deps {org.clojure/clojurescript {:mvn/version "1.10.520"}
thheller/shadow-cljs {:mvn/version "2.8.58"}
expound {:mvn/version "0.7.2"}
:extra-deps {org.clojure/clojurescript {:mvn/version "1.10.773"}
thheller/shadow-cljs {:mvn/version "2.10.14"}
expound {:mvn/version "0.8.4"}
fulcrologic/fulcro-spec {:mvn/version "3.1.4"}
binaryage/devtools {:mvn/version "0.9.10"}
com.github.awkay/workspaces {:mvn/version "1.0.0-RC2"},
org.clojure/tools.namespace {:mvn/version "0.3.1"}}}}}
binaryage/devtools {:mvn/version "1.0.0"}
com.github.awkay/workspaces {:mvn/version "1.0.1"},
org.clojure/tools.namespace {:mvn/version "1.0.0"}}}}}
4 changes: 2 additions & 2 deletions guardrails.edn
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{:defn-macro nil
:throw? true
:emit-spec? false
:throw? false
:emit-spec? true
:expound {:show-valid-values? true
:print-specs? true}}
18 changes: 9 additions & 9 deletions package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,6 @@
"description": "",
"private": true,
"dependencies": {
"highlight.js": "^9.13.1",
"react-grid-layout": "^0.16.6",
"react-icons": "^2.2.7",
"reakit": "^0.11.2"
},
"scripts": {
"client/main": "npx shadow-cljs watch :main",
Expand All @@ -21,14 +17,18 @@
"start": "npx run-p client/server server"
},
"devDependencies": {
"highlight.js": "^9.13.1",
"react-grid-layout": "^0.16.6",
"react-icons": "^2.2.7",
"reakit": "^0.11.2",
"intl-messageformat": "^2.2.0",
"karma": "^3.1.1",
"karma-chrome-launcher": "^2.2.0",
"karma": "^5.1.0",
"karma-chrome-launcher": "^3.1.0",
"karma-cljs-test": "^0.1.0",
"npm-run-all": "^4.1.5",
"react": "^16.6.8",
"react-dom": "^16.6.8",
"shadow-cljs": "^2.8.58",
"react": "^16.13.1",
"react-dom": "^16.13.1",
"shadow-cljs": "^2.10.14",
"showdown": "^1.8.7"
},
"author": "",
Expand Down
8 changes: 4 additions & 4 deletions shadow-cljs.edn
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,7 @@
:output-dir "resources/public/js/main"
:asset-path "/js/main"

:modules {:main {:init-fn app.client/init
:entries [app.client]}}
:modules {:main {:init-fn app.client/init}}
;; guardrails checks only during dev
:dev {:compiler-options
{:external-config {:guardrails {}}}}
Expand All @@ -18,14 +17,15 @@
:ns-regexp "-test$"
;; static required for mocking to work
:compiler-options {:static-fns false
:external-config {:guardrails {}}}
:external-config {:guardrails {:throw? true}}}
:devtools {:http-port 8022
:http-resource-root "public"
:http-root "resources/public/js/test"}}

:ci-tests {:target :karma
:js-options {:js-provider :shadow}
:compiler-options {:static-fns false} ; required for mocking to work
:compiler-options {:static-fns false
:external-config {:guardrails {:throw? true}}}
:output-to "target/ci.js"
:ns-regexp "-test$"}

Expand Down
7 changes: 4 additions & 3 deletions src/main/app/application.cljs
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
(ns app.application
(:require [com.fulcrologic.fulcro.networking.http-remote :as net]
[com.fulcrologic.fulcro.application :as app]
[com.fulcrologic.fulcro.components :as comp]))
(:require
[com.fulcrologic.fulcro.networking.http-remote :as net]
[com.fulcrologic.fulcro.application :as app]
[com.fulcrologic.fulcro.components :as comp]))

(def secured-request-middleware
;; The CSRF token is embedded via server_components/html.clj
Expand Down
60 changes: 30 additions & 30 deletions src/main/config/defaults.edn
View file
Original file line number Diff line number Diff line change
@@ -1,37 +1,37 @@
{:legal-origins #{"localhost" "dev.lvh.me"}
{:legal-origins #{"localhost" "dev.lvh.me"}

:org.httpkit.server/config {:port 3000}

:taoensso.timbre/logging-config
{:level :info
:ns-whitelist []
:ns-blacklist ["datomic.kv-cluster"
"datomic.process-monitor"
"datomic.reconnector2"
"datomic.common"
"datomic.peer"
"datomic.log"
"datomic.db"
"datomic.slf4j"
"org.projectodd.wunderboss.web.Web"
"shadow.cljs.devtools.server.worker.impl"]}
{:level :info
:ns-whitelist []
:ns-blacklist ["datomic.kv-cluster"
"datomic.process-monitor"
"datomic.reconnector2"
"datomic.common"
"datomic.peer"
"datomic.log"
"datomic.db"
"datomic.slf4j"
"org.projectodd.wunderboss.web.Web"
"shadow.cljs.devtools.server.worker.impl"]}

;; The ssl-redirect defaulted to off, but for security should probably be on in production.
:ring.middleware/defaults-config
{:params {:keywordize true
:multipart true
:nested true
:urlencoded true}
:cookies true
:responses {:absolute-redirects true
:content-types true
:default-charset "utf-8"
:not-modified-responses true}
:static {:resources "public"}
:session true
:security {:anti-forgery true
:hsts true
:ssl-redirect false
:frame-options :sameorigin
:xss-protection {:enable? true
:mode :block}}}}
{:params {:keywordize true
:multipart true
:nested true
:urlencoded true}
:cookies true
:responses {:absolute-redirects true
:content-types true
:default-charset "utf-8"
:not-modified-responses true}
:static {:resources "public"}
:session true
:security {:anti-forgery true
:hsts true
:ssl-redirect false
:frame-options :sameorigin
:xss-protection {:enable? true
:mode :block}}}}
2 changes: 1 addition & 1 deletion src/main/config/prod.edn
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{;; Legal Origins for API request.
:legal-origins #{"product.domain" "localhost"}

:org.httpkit.server/config {:port 8080}
:org.httpkit.server/config {:port 8080}

:taoensso.timbre/logging-config {:level :info}
;; You probably want these set to true in real production:
Expand Down
Loading

0 comments on commit 6fe4351

Please sign in to comment.