diff --git a/project.clj b/project.clj index d370da8..fdc6a04 100644 --- a/project.clj +++ b/project.clj @@ -4,7 +4,7 @@ :license {:name "Eclipse Public License" :url "http://www.eclipse.org/legal/epl-v10.html"} - :source-paths ["src/clj" "src/cljs"] + :source-paths ["src/clj"] :dependencies [[org.clojure/clojure "1.6.0"] [org.clojure/clojurescript "0.0-SNAPSHOT"] ; local build of master @@ -46,7 +46,7 @@ :uberjar-name "stack_spike.jar" - :cljsbuild {:builds {:app {:source-paths ["src"] + :cljsbuild {:builds {:app {:source-paths ["src/cljs"] :compiler {:main "stack-spike.dev" :output-to "resources/public/js/main.js" :output-dir "resources/public/js/out" @@ -54,12 +54,12 @@ :optimizations :none :pretty-print true :source-map true}} - :iso {:source-paths ["src"] + :iso {:source-paths ["src/cljs"] :compiler {:main "stack-spike.om-app" :output-to "resources/public/js/main-iso.js" :optimizations :advanced}}}} - :profiles {:dev {:repl-options {:init-ns user + :profiles {:dev {:repl-options {:init-ns dev :nrepl-middleware [cemerick.piggieback/wrap-cljs-repl]} :plugins [[lein-figwheel "0.1.4-SNAPSHOT"]] @@ -71,13 +71,7 @@ :env {:is-dev true} :cljsbuild {:builds {:app {:source-paths ["env/dev/cljs"]}}}} - :iso { - :cljsbuild {:builds {:app {:source-paths ["env/dev/cljs"] - :compiler {:optimizations :advanced - :output-to "resources/public/js/main-advanced.js" - :source-map false - :pretty-print false - :output-dir "resources/public/js"}}}}} + :uberjar {:hooks [leiningen.cljsbuild] :env {:production true} :omit-source true diff --git a/src/clj/user.clj b/src/clj/user.clj deleted file mode 100644 index 103b4d2..0000000 --- a/src/clj/user.clj +++ /dev/null @@ -1,72 +0,0 @@ -(ns user - "Tools for interactive development with the REPL. This file should - not be included in a production build of the application." - (:require [com.stuartsierra.component :as component] - [clojure.tools.namespace.repl :refer (refresh-all refresh) :as tn] - [environ.core :refer [env]] - [stack-spike.core :refer :all] - [clojure.test] - [clojure.stacktrace :refer [print-stack-trace print-cause-trace]] - [clojure.pprint :refer :all] - [clojure.tools.logging :as log] - [stack-spike.external.database :refer [entity-gateway]] - [stack-spike.use-case.entity-gateway :as eg] - [stack-spike.external.url :refer [local-host-name]] - [cemerick.piggieback :as piggieback] - [weasel.repl.websocket :as weasel] - [cljs.repl.browser] - [leiningen.core.main :as lein])) - -(def is-dev? (env :is-dev)) - -(defn weasel-repl [] - (piggieback/cljs-repl :repl-env (weasel/repl-env :ip "0.0.0.0" :port 9001))) - -(defn piggieback-repl [] - (cemerick.piggieback/cljs-repl :repl-env (cljs.repl.browser/repl-env :port 9000)) ) - -(defn start-figwheel [] - (future - (print "Starting figwheel.\n") - (lein/-main "figwheel" :app :iso))) - -(defonce system nil) - -(defn init [] - (alter-var-root #'system - (constantly (application (local-host-name) 8080 "datomic:dev://localhost:4334/stack-spike-dev" )))) - -(defn start [] - (alter-var-root #'system component/start)) - -(defn stop [] - (alter-var-root #'system - (fn [s] (when s (component/stop s))))) - -(defn go [] - (init) - (start)) - -(defn reset [] - (stop) - (refresh :after 'user/go)) - - -(defn run-tests - [] - (clojure.test/run-all-tests #"^stack-spike.*")) - -(defn t [] - (refresh :after 'user/run-tests)) - -;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; -;; Miscellaneous tools - -(defn show-methods [x] (sort - (filter - #(not (re-find #"^(__|const)" (str %))) - (map :name (:members (clojure.reflect/reflect x)))))) - -(defn eg [] - "Get an entity gateway for the current system." - (entity-gateway (:db system)))