Clean up deps

.gitignore

@@ -1,5 +1,7 @@
 /target
 /public/js/out
+/public/js/grub.js
+/public/js/grub.min.js
 /lib
 /classes
 /checkouts

deploy.sh

@@ -3,7 +3,7 @@
 git branch -D deploy
 git checkout -b deploy
 lein cljsbuild once prod
-git add --force public/js/grub.js
+git add --force public/js/grub.min.js
 git commit -m "Add client code for Heroku deployment"
 git push --force heroku deploy:master
 git checkout master

project.clj

@@ -24,12 +24,15 @@
             [lein-ring "0.8.6"]]
   :cljsbuild {:builds {:dev {:source-paths ["src/cljs"]
                              :compiler {:output-dir "public/js/out"
-                                        :output-to "public/js/grub_dev.js"
+                                        :output-to "public/js/grub.js"
                                         :optimizations :none
                                         :source-map true}}
                        :prod {:source-paths ["src/cljs"]
-                              :compiler {:output-to "public/js/grub.js"
+                              :compiler {:output-to "public/js/grub.min.js"
-                                         :optimizations :advanced}}}}
+                                         :optimizations :advanced
+                                         :pretty-print false
+                                         :preamble ["react/react.min.js"]
+                                         :externs ["react/externs/react.js"]}}}}
   :source-paths ["src/clj" "src/test"]
   :test-paths ["spec/clj"]
   :ring {:handler grub.core/app}

public/.gitignore

@@ -1,3 +0,0 @@
-js/grub.js
-js/grub_dev.js
-js/grub_dev.js.map

src/clj/grub/core.clj

@@ -14,33 +14,29 @@
              [page :refer [include-js include-css]]]
             [clojure.tools.cli :refer [parse-opts]]))
 
-(def index-page-header
-  [:head
-   [:title "Grub"]
-   [:meta {:name "viewport" :content "width=device-width, initial-scale=1.0"}]
-   (include-css "/css/bootstrap.css")
-   (include-css "/css/styles.css")])
-
 (def prod-index-page
   (html5
-   index-page-header
+   [:head
+    [:title "Grub"]
+    [:meta {:name "viewport" :content "width=device-width, initial-scale=1.0"}]
+    (include-css "/css/bootstrap.min.css")
+    (include-css "/css/styles.css")]
    [:body
     [:div#container]
-    (include-js "/js/react-0.9.0.min.js")
+    (include-js "/js/grub.min.js")]))
-    (include-js "/js/jquery.js")
-    (include-js "/js/bootstrap.js")
-    (include-js "/js/grub.js")]))
 
 (def dev-index-page
   (html5
-   index-page-header
+   [:head
+    [:title "Grub"]
+    [:meta {:name "viewport" :content "width=device-width, initial-scale=1.0"}]
+    (include-css "/css/bootstrap.css")
+    (include-css "/css/styles.css")]
    [:body
     [:div#container]
-    (include-js "/js/react-0.9.0.js")
+    (include-js "/js/react-0.11.1.js")
     (include-js "/js/out/goog/base.js")
-    (include-js "/js/jquery.js")
+    (include-js "/js/grub.js")
-    (include-js "/js/bootstrap.js")
-    (include-js "/js/grub_dev.js")
     [:script {:type "text/javascript"} "goog.require(\"grub.core\")"]]))
 
 (def index-page (atom dev-index-page))