Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Merge remote-tracking branch 'origin/master' into develop/1.0.0

Conflicts:
	example-projects/advanced/project.clj
	example-projects/simple/project.clj
  • Loading branch information...
commit b245661dcbb4a4573c7869fbe6ee221033eff939 2 parents f5abefc + d386396
@cemerick cemerick authored
View
9 example-projects/advanced/README.md
@@ -15,9 +15,16 @@ To play around with this example project, you will first need
Set up and start the server like this:
- $ lein deps
+ $ cd example-projects/advanced
$ lein ring server-headless 3000
+> NOTE 1: You do not need to issue the `lein cljsbuild once`
+> subtask. This is because `cljsbuild` has been hooked to `lein` tasks
+> in the `project.clj` (i.e. `:hooks [leiningen.cljsbuild]`). This way
+> when the above `lein ring server-headless 3000` subtask is executed,
+> it implicitly executes the `lein compile` task which, in turn,
+> implicitly executes the `lein cljsbuild once` subtask as well.
+
Now, point your web browser at `http://localhost:3000`, and see the web app in action!
## PhantomJS
View
6 example-projects/advanced/project.clj
@@ -4,10 +4,10 @@
:dependencies [[org.clojure/clojure "1.5.1"]
[org.clojure/clojurescript "0.0-1859"
:exclusions [org.apache.ant/ant]]
- [compojure "1.0.4"]
- [hiccup "1.0.0"]]
+ [compojure "1.1.6"]
+ [hiccup "1.0.4"]]
:plugins [[lein-cljsbuild "1.0.0-SNAPSHOT"]
- [lein-ring "0.7.0"]]
+ [lein-ring "0.8.7"]]
; Enable the lein hooks for: clean, compile, test, and jar.
:hooks [leiningen.cljsbuild]
:cljsbuild {
View
2  example-projects/simple/README.md
@@ -11,7 +11,7 @@ To play around with this example project, you will first need
Set up and start the server like this:
- $ lein deps
+ $ cd example-projects/simple
$ lein cljsbuild once
$ lein ring server-headless 3000
View
6 example-projects/simple/project.clj
@@ -4,10 +4,10 @@
:dependencies [[org.clojure/clojure "1.5.1"]
[org.clojure/clojurescript "0.0-1859"
:exclusions [org.apache.ant/ant]]
- [compojure "1.0.4"]
- [hiccup "1.0.0"]]
+ [compojure "1.1.6"]
+ [hiccup "1.0.4"]]
:plugins [[lein-cljsbuild "1.0.0-SNAPSHOT"]
- [lein-ring "0.7.0"]]
+ [lein-ring "0.8.7"]]
:cljsbuild {
:builds [{:source-paths ["src-cljs"]
:compiler {:output-to "resources/public/js/main.js"
Please sign in to comment.
Something went wrong with that request. Please try again.