Added cljs test target, and make sure cljx is run

theleoborges · Oct 29, 2014 · f414370 · f414370
1 parent 4bc0352
commit f414370
Showing 1 changed file with 26 additions and 24 deletions.
diff --git a/project.clj b/project.clj
@@ -6,33 +6,35 @@
   :jar-exclusions [#"\.cljx"]
   :dependencies [[org.clojure/clojure "1.6.0-RC1"]
                  [clj-time "0.8.0"]]
-  :plugins [[lein-marginalia "0.7.1"]]
+  :plugins [[lein-marginalia "0.7.1"]
+            [com.keminglabs/cljx "0.4.0"]]
+  :cljx {:builds [{:source-paths ["src"]
+                   :output-path "target/classes"
+                   :rules :clj}
+                  {:source-paths ["src"]
+                   :output-path "target/classes"
+                   :rules :cljs}
+                  {:source-paths ["test"]
+                   :output-path "target/test-classes"
+                   :rules :clj}
+                  {:source-paths ["test"]
+                   :output-path "target/test-classes"
+                   :rules :cljs}]}
+  :hooks [cljx.hooks]
   :profiles {:1.4 {:dependencies [[org.clojure/clojure "1.4.0"]]}
              :1.5 {:dependencies [[org.clojure/clojure "1.5.1"]]}
              :1.6 {:dependencies [[org.clojure/clojure "1.6.0"]]}
-             :dev {:dependencies [[org.clojure/clojurescript "0.0-2371"]
-                                  [com.andrewmcveigh/cljs-time "0.2.3"]]
-                   :plugins [[com.keminglabs/cljx "0.4.0"]
-                             [lein-cljsbuild "1.0.3"]
-                             [com.cemerick/clojurescript.test "0.3.1"]]
-                   :cljx {:builds [{:source-paths ["src"]
-                                    :output-path "target/classes"
-                                    :rules :clj}
-                                   {:source-paths ["src"]
-                                    :output-path "target/classes"
-                                    :rules :cljs}
-                                   {:source-paths ["test"]
-                                    :output-path "target/test-classes"
-                                    :rules :clj}
-                                   {:source-paths ["test"]
-                                    :output-path "target/test-classes"
-                                    :rules :cljs}]}
-                   :cljsbuild {:test-commands {"phantom" ["phantomjs" :runner "target/testable.js"]}
-                               :builds [{:source-paths ["target/classes" "target/test-classes"]
+             :cljs {:dependencies [[org.clojure/clojurescript "0.0-2371"]
+                                   [com.andrewmcveigh/cljs-time "0.2.3"]]
+                    :plugins [[lein-cljsbuild "1.0.3"]
+                              [com.cemerick/clojurescript.test "0.3.1"]]
+                    :cljsbuild {:test-commands {"phantom" ["phantomjs" :runner "target/testable.js"]}
+                                :builds [{:source-paths ["target/classes" "target/test-classes"]
                                          :compiler {:output-to "target/testable.js"
-                                                    :source-map "target/testable.js.map"
-                                                    :optimizations :advanced
-                                                    :pretty-print false}}]}}}
-  :aliases {"all-tests" ["with-profile" "dev:1.4:1.5:1.6" "test"]}
+                                                    :optimizations :whitespace}}]}
+                    :hooks [cljx.hooks
+                            leiningen.cljsbuild]}}
+  :aliases {"all-tests" ["with-profile" "cljs:1.4:1.5:1.6" "test"]
+            "cljs-test" ["with-profile" "cljs" "test"]}
   :source-paths ["src" "target/classes"]
   :test-paths ["target/test-classes"])