Merge remote-tracking branch 'upstream/master' into less-profile

reagent-project · May 20, 2015 · 1d405d6 · 1d405d6
2 parents 1c3dd5d + f9baeda
commit 1d405d6
Show file tree

Hide file tree

Showing 8 changed files with 41 additions and 41 deletions.
diff --git a/README.md b/README.md
@@ -5,7 +5,9 @@ A [Leiningen](http://leiningen.org/) template for projects using Reagent.
 ![reagent-template](logo-rounded.jpg)
 
 A Leiningen template for a Clojure/ClojureScript app based on Reagent, with a focus on providing
-a betteries included setup for development and deployment.
+a batteries included setup for development and deployment.
+
+#### Requires JDK 1.7+
 
 ### Development
 
@@ -50,7 +52,7 @@ When using `cljx` make sure to run `lein cljx` to cross-compile `cljx` namespace
 To run the development server, run
 
 ```
-lein figwheel
+lein do clean, figwheel
 ```
 Figwheel will automatically push cljs changes to the browser.
 
@@ -140,7 +142,7 @@ The template packages everything you need to create a production ready ClojureSc
 * [reagent-forms](https://github.com/reagent-project/reagent-forms) - data binding library for Reagent
 * [reagent-utils](https://github.com/reagent-project/reagent-utils) - utilities such as session and cookie management
 * [Secretary](https://github.com/gf3/secretary) - client-side routing
-* [Selmer](https://github.com/yogthos/Selmer) - HTML templating
+* [Hiccup](https://github.com/weavejester/hiccup) - server-side HTML templating
 * [Compojure](https://github.com/weavejester/compojure) - a popular routing library
 * [Ring](https://github.com/ring-clojure/ring) - Clojure HTTP interface
 * [Prone](https://github.com/magnars/prone) - better exception reporting middleware for Ring

diff --git a/project.clj b/project.clj
@@ -1,4 +1,4 @@
-(defproject reagent/lein-template "0.7.4"
+(defproject reagent/lein-template "0.8.3"
   :description "A Leiningen template for a ClojureScript setup with Figwheel, Austin, and Reagent."
   :url "https://github.com/reagent-project/reagent-template"
   :license {:name "MIT License"

diff --git a/src/leiningen/new/reagent.clj b/src/leiningen/new/reagent.clj
@@ -88,7 +88,7 @@
   (let [data (template-data name opts)
         args [data
               ["project.clj" (render "project.clj" data)]
-              ["resources/templates/index.html" (render "resources/templates/index.html" data)]
+              ["resources/public/css/site.css" (render "resources/public/css/site.css" data)]
               ["src/clj/{{sanitized}}/handler.clj" (render "src/clj/reagent/handler.clj" data)]
               ["src/clj/{{sanitized}}/server.clj" (render "src/clj/reagent/server.clj" data)]
               ["env/dev/clj/{{sanitized}}/dev.clj" (render "env/dev/clj/reagent/dev.clj" data)]

diff --git a/src/leiningen/new/reagent/project.clj b/src/leiningen/new/reagent/project.clj
@@ -6,24 +6,23 @@
 
   :source-paths ["src/clj" "src/cljs"{{{cljx-source-paths}}}]
 
-  :dependencies [[org.clojure/clojure "1.6.0"]
+  :dependencies [[org.clojure/clojure "1.7.0-beta3"]
                  [ring-server "0.4.0"]
                  [cljsjs/react "0.13.1-0"]
                  [reagent "0.5.0"]
-                 [reagent-forms "0.5.0"]
+                 [reagent-forms "0.5.1"]
                  [reagent-utils "0.1.4"]
-                 [org.clojure/clojurescript "0.0-3196" :scope "provided"]
                  [ring "1.3.2"]
                  [ring/ring-defaults "0.1.4"]
-                 [prone "0.8.1"]
+                 [prone "0.8.2"]
                  [compojure "1.3.3"]
-                 [selmer "0.8.2"]
+                 [hiccup "1.0.5"]
                  [environ "1.0.0"]
+                 [org.clojure/clojurescript "0.0-3291" :scope "provided"]
                  [secretary "1.2.3"]{{{app-dependencies}}}]
 
-  :plugins [[lein-cljsbuild "1.0.4"]
+  :plugins [[lein-ring "0.9.1"]
             [lein-environ "1.0.0"]
-            [lein-ring "0.9.1"]
             [lein-asset-minifier "0.2.2"]]
 
   :ring {:handler {{project-ns}}.handler/app
@@ -35,7 +34,8 @@
 
   :main {{project-ns}}.server
 
-  :clean-targets ^{:protect false} ["resources/public/js"]
+  :clean-targets ^{:protect false} [[:cljsbuild :builds :app :compiler :output-dir]
+                                    [:cljsbuild :builds :app :compiler :output-to]]
 
   :minify-assets
   {:assets
@@ -55,15 +55,16 @@
 
                    :dependencies [[ring-mock "0.1.5"]
                                   [ring/ring-devel "1.3.2"]
-                                  [leiningen "2.5.1"]
-                                  [figwheel "0.2.6"]
                                   [weasel "0.6.0"]
-                                  [com.cemerick/piggieback "0.2.0"]
+                                  [leiningen-core "2.5.1"]
+                                  [lein-figwheel "0.3.3"]
+                                  [com.cemerick/piggieback "0.2.1"]
                                   [org.clojure/tools.nrepl "0.2.10"]
                                   [pjstadig/humane-test-output "0.7.0"]{{{dev-dependencies}}}]
 
                    :source-paths ["env/dev/clj"]
-                   :plugins [[lein-figwheel "0.2.5"]{{{project-dev-plugins}}}]
+                   :plugins [[lein-figwheel "0.3.3"]
+                             [lein-cljsbuild "1.0.6"]{{{project-dev-plugins}}}]
 
                    :injections [(require 'pjstadig.humane-test-output)
                                 (pjstadig.humane-test-output/activate!)]
@@ -73,7 +74,7 @@
                               :css-dirs ["resources/public/css"]
                               :ring-handler {{project-ns}}.handler/app}
 
-                   :env {:dev? true}
+                   :env {:dev true}
 
                    {{#cljx-hook?}}
                    :prep-tasks [["cljx" "once"]  "javac" "compile"]
@@ -93,8 +94,7 @@
                                         :test {:source-paths ["src/cljs" {{{cljx-cljsbuild-spath}}} "test/cljs"]
                                                :compiler {:output-to "target/test.js"
                                                           :optimizations :whitespace
-                                                          :pretty-print true
-                                                          :preamble ["react/react.js"]}}{{/test-hook?}}}
+                                                          :pretty-print true}}{{/test-hook?}}}
                                {{#test-hook?}}
                                :test-commands {"unit" ["phantomjs" :runner
                                                        "test/vendor/es5-shim.js"

diff --git a/src/leiningen/new/reagent/resources/templates/index.html b/src/leiningen/new/reagent/resources/templates/index.html
diff --git a/src/leiningen/new/reagent/src/clj/reagent/handler.clj b/src/leiningen/new/reagent/src/clj/reagent/handler.clj
@@ -2,15 +2,28 @@
   (:require [compojure.core :refer [GET defroutes]]
             [compojure.route :refer [not-found resources]]
             [ring.middleware.defaults :refer [site-defaults wrap-defaults]]
-            [selmer.parser :refer [render-file]]
+            [hiccup.core :refer [html]]
+            [hiccup.page :refer [include-js include-css]]
             [prone.middleware :refer [wrap-exceptions]]
             [environ.core :refer [env]]))
 
+(def home-page
+  (html
+   [:html
+    [:head
+     [:meta {:charset "utf-8"}]
+     [:meta {:name "viewport"
+             :content "width=device-width, initial-scale=1"}]
+     (include-css (if (env :dev) "css/site.css" "css/site.min.css"))]
+    [:body
+     [:div#app]
+     (include-js "js/app.js")]]))
+
 (defroutes routes
-  (GET "/" [] (render-file "templates/index.html" {:dev (env :dev?)}))
+  (GET "/" [] home-page)
   (resources "/")
   (not-found "Not Found"))
 
 (def app
   (let [handler (wrap-defaults routes site-defaults)]
-    (if (env :dev?) (wrap-exceptions handler) handler)))
+    (if (env :dev) (wrap-exceptions handler) handler)))
diff --git a/src/leiningen/new/reagent/src/clj/reagent/server.clj b/src/leiningen/new/reagent/src/clj/reagent/server.clj
@@ -1,8 +1,9 @@
 (ns {{project-ns}}.server
   (:require [{{project-ns}}.handler :refer [app]]
+            [environ.core :refer [env]]
             [ring.adapter.jetty :refer [run-jetty]])
   (:gen-class))
 
  (defn -main [& args]
-   (let [port (Integer/parseInt (or (System/getenv "PORT") "3000"))]
+   (let [port (Integer/parseInt (or (env :port) "3000"))]
      (run-jetty app {:port port :join? false})))
diff --git a/src/leiningen/new/reagent/src/cljs/reagent/core.cljs b/src/leiningen/new/reagent/src/cljs/reagent/core.cljs
@@ -3,8 +3,7 @@
               [reagent.session :as session]
               [secretary.core :as secretary :include-macros true]
               [goog.events :as events]
-              [goog.history.EventType :as EventType]
-              [cljsjs.react :as react])
+              [goog.history.EventType :as EventType])
     (:import goog.History))
 
 ;; -------------------------