Update figwheel and simplify doc app configuration

reagent-project · May 27, 2016 · d3ee4a7 · d3ee4a7
1 parent baf2107
commit d3ee4a7
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 16 deletions.
diff --git a/Makefile b/Makefile
@@ -23,7 +23,7 @@ runpack: target/webpack/bundle.js
 
 # development build with figwheel, but no tests
 runnotest:
-	@$(MAKE) run PROF=+dev-notest,$(PROF)
+	@$(MAKE) run PROF=dev-notest,$(PROF)
 
 # production build with auto-rebuild
 runprod: clean

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

diff --git a/test/reagenttest/runtests.cljs b/test/reagenttest/runtests.cljs
@@ -54,7 +54,4 @@
     (reset! demo/test-results [#'test-output-mini])
     (run-tests)))
 
-(defn reload []
-  (demo/init!))
-
 (init!)