Update figwheel and simplify doc app configuration

This commit is contained in:
Dan Holmsand 2016-05-27 12:55:13 +02:00
parent baf2107c15
commit d3ee4a7f8b
4 changed files with 9 additions and 16 deletions

View File

@ -23,7 +23,7 @@ runpack: target/webpack/bundle.js
# development build with figwheel, but no tests # development build with figwheel, but no tests
runnotest: runnotest:
@$(MAKE) run PROF=+dev-notest,$(PROF) @$(MAKE) run PROF=dev-notest,$(PROF)
# production build with auto-rebuild # production build with auto-rebuild
runprod: clean runprod: clean

View File

@ -41,4 +41,4 @@
:css-infiles ["site/public/css/examples.css" :css-infiles ["site/public/css/examples.css"
"site/public/css/main.css"]})) "site/public/css/main.css"]}))
(defonce inited (init!)) (init!)

View File

@ -21,18 +21,16 @@
:compiler :compiler
{:main "reagenttest.runtests"}}}}} {:main "reagenttest.runtests"}}}}}
:dev [:test :fig [{:dependencies [[figwheel "0.5.3-2"]]
{:dependencies [[figwheel "0.5.2"]] :plugins [[lein-figwheel "0.5.3-2"]]
:plugins [[lein-figwheel "0.5.2"]]
:source-paths ["demo"] ;; for lighttable :source-paths ["demo"] ;; for lighttable
:resource-paths ["site" "outsite"] :resource-paths ["site" "outsite"]
:figwheel {:css-dirs ["site/public/css"]} :figwheel {:css-dirs ["site/public/css"]}
:cljsbuild :cljsbuild
{:builds {:builds
{:client {:client
{:figwheel {:on-jsload "reagenttest.runtests/reload"} {:figwheel true
:compiler {:source-map true :compiler {:source-map true
:source-map-timestamp true
:optimizations :none :optimizations :none
;; :recompile-dependents false ;; :recompile-dependents false
:output-dir "outsite/public/js/out" :output-dir "outsite/public/js/out"
@ -50,7 +48,6 @@
{:compiler {:optimizations :advanced {:compiler {:optimizations :advanced
:elide-asserts true :elide-asserts true
:pretty-print false :pretty-print false
:main "reagentdemo.core"
;; :pseudo-names true ;; :pseudo-names true
:output-dir "target/client"}}}}}] :output-dir "target/client"}}}}}]
@ -67,11 +64,9 @@
:prod-test [:prod :test] :prod-test [:prod :test]
:dev-notest [:dev :dev [:fig :test]
{:cljsbuild
{:builds {:client :dev-notest [:fig]}
{:compiler {:load-tests false}}}}
:figwheel {:validate-config false}}]}
:clean-targets ^{:protect false} [:target-path :compile-path :clean-targets ^{:protect false} [:target-path :compile-path
"outsite/public/js" "outsite/public/js"
@ -88,6 +83,7 @@
"examples/simple/src" "examples/simple/src"
"examples/geometry/src"] "examples/geometry/src"]
:compiler {:parallel-build true :compiler {:parallel-build true
:main "reagentdemo.core"
:output-to "outsite/public/js/main.js"}}}} :output-to "outsite/public/js/main.js"}}}}
:figwheel {:http-server-root "public" ;; assumes "resources" :figwheel {:http-server-root "public" ;; assumes "resources"

View File

@ -54,7 +54,4 @@
(reset! demo/test-results [#'test-output-mini]) (reset! demo/test-results [#'test-output-mini])
(run-tests))) (run-tests)))
(defn reload []
(demo/init!))
(init!) (init!)