From 2e499555f2450dc136b8dc26ef6841a682eb20ca Mon Sep 17 00:00:00 2001 From: Daniel Manila Date: Sun, 16 Sep 2018 20:49:42 -0400 Subject: [PATCH] Fix boot cljs repl --- resources/leiningen/new/luminus/core/build.boot | 3 +-- src/leiningen/new/cljs.clj | 12 ++++++++---- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/resources/leiningen/new/luminus/core/build.boot b/resources/leiningen/new/luminus/core/build.boot index e92851f4..2191bf3f 100644 --- a/resources/leiningen/new/luminus/core/build.boot +++ b/resources/leiningen/new/luminus/core/build.boot @@ -77,9 +77,8 @@ (comp (start-server) (watch) - (cljs-repl) (reload :client-opts {:debug true}) - (speak) + (cljs-repl) (cljs)))) (deftask run-cljs-tests diff --git a/src/leiningen/new/cljs.clj b/src/leiningen/new/cljs.clj index 51c69d38..8015050e 100644 --- a/src/leiningen/new/cljs.clj +++ b/src/leiningen/new/cljs.clj @@ -42,7 +42,6 @@ (def cljs-dev-dependencies [['doo doo-version] ['binaryage/devtools "0.9.10"] - ['figwheel-sidecar figwheel-version] ['cider/piggieback "0.3.9"]]) (defn get-output-dir [features] @@ -105,6 +104,9 @@ :css-dirs ["resources/public/css"] :nrepl-middleware `[cider/wrap-cljs-repl cider.piggieback/wrap-cljs-repl]} ) +(def cljs-lein-dev-dependencies + [['figwheel-sidecar figwheel-version]]) + (defn cljs-lein-features [[assets options :as state]] [assets (-> options @@ -116,20 +118,22 @@ :figwheel (indent root-indent (figwheel options)) :cljs-uberjar-prep ":prep-tasks [\"compile\" [\"cljsbuild\" \"once\" \"min\"]]") (append-options :source-paths [(:client-path options) (:cljc-path options)]) - (append-options :resource-paths resource-paths))]) + (append-options :resource-paths resource-paths) + (append-options :dev-dependencies cljs-lein-dev-dependencies))]) ;; Options for boot (defn boot-cljs-assets [{:keys [client-path]}] [[(str client-path "/app.cljs.edn") "cljs/src/cljs/app.cljs.edn"]]) -(def cljs-boot-plugins '[[adzerk/boot-cljs "2.1.0-SNAPSHOT" :scope "test"] +(def cljs-boot-plugins '[[adzerk/boot-cljs "2.1.4" :scope "test"] [crisptrutski/boot-cljs-test "0.3.2-SNAPSHOT" :scope "test"] [adzerk/boot-cljs-repl "0.3.3" :scope "test"]]) (def cljs-boot-dev-plugins - '[[crisptrutski/boot-cljs-test "0.3.2-SNAPSHOT" :scope "test"] + '[[crisptrutski/boot-cljs-test "0.3.4" :scope "test"] [powerlaces/boot-figreload "0.1.1-SNAPSHOT" :scope "test"] + [com.cemerick/piggieback "0.2.1" :scope "test"] [org.clojure/clojurescript cljs-version :scope "test"] [weasel "0.7.0" :scope "test"] [org.clojure/tools.nrepl "0.2.12" :scope "test"]])