Skip to content

Commit

Permalink
All lein projects given names and figwheel-sidecar version increased …
Browse files Browse the repository at this point in the history
…to "0.5.9". Two dev/server/user.clj files made to be able to work with Cursive stubs generation.
  • Loading branch information
Chris Murphy committed Feb 22, 2017
1 parent f16ac6b commit b7c183d
Show file tree
Hide file tree
Showing 18 changed files with 74 additions and 75 deletions.
4 changes: 2 additions & 2 deletions recipes/background-loads/project.clj
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
(defproject untangled/demo "1.0.0"
(defproject untangled/background-loads "1.0.0"
:description "Untangled Cookbook Recipe"
:url ""
:license {:name "MIT"
Expand All @@ -11,7 +11,7 @@
[org.clojure/clojurescript "1.8.51"]
[org.omcljs/om "1.0.0-alpha41"]
[binaryage/devtools "0.5.2"]
[figwheel-sidecar "0.5.3-1" :exclusions [ring/ring-core joda-time org.clojure/tools.reader]]
[figwheel-sidecar "0.5.9" :exclusions [ring/ring-core joda-time org.clojure/tools.reader]]
[com.cemerick/piggieback "0.2.1"]
[org.clojure/tools.nrepl "0.2.12"]
[juxt/dirwatch "0.2.3"]
Expand Down
4 changes: 2 additions & 2 deletions recipes/component-local-state/project.clj
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
(defproject untangled/demo "1.0.0"
(defproject untangled/component-local-state "1.0.0"
:description "Component Local State"
:url ""
:license {:name "MIT"
Expand Down Expand Up @@ -34,4 +34,4 @@

:profiles {:dev {:dependencies [[binaryage/devtools "0.5.2"]
[org.clojure/tools.namespace "0.2.11"]
[figwheel-sidecar "0.5.5" :exclusions [ring/ring-core joda-time org.clojure/tools.reader]]]}})
[figwheel-sidecar "0.5.9" :exclusions [ring/ring-core joda-time org.clojure/tools.reader]]]}})
42 changes: 20 additions & 22 deletions recipes/css/dev/server/user.clj
Original file line number Diff line number Diff line change
@@ -1,28 +1,26 @@
(ns clj.user
(:require
[clojure.set :as set]
[clojure.tools.namespace.repl :refer [refresh]]
[figwheel-sidecar.system :as fig]
[com.stuartsierra.component :as component]))
(:require
[figwheel-sidecar.system :as fig]
[com.stuartsierra.component :as component]))

;;FIGWHEEL
(def figwheel (atom nil))

(defn start-figwheel
"Start Figwheel on the given builds, or defaults to build-ids in `figwheel-config`."
([]
(let [props (System/getProperties)
figwheel-config (fig/fetch-config)
all-builds (->> figwheel-config :data :all-builds (mapv :id))]
(start-figwheel (keys (select-keys props all-builds)))))
([build-ids]
(let [figwheel-config (fig/fetch-config)
default-build-ids (-> figwheel-config :data :build-ids)
build-ids (if (empty? build-ids) default-build-ids build-ids)
preferred-config (assoc-in figwheel-config [:data :build-ids] build-ids)]
(reset! figwheel (component/system-map
:figwheel-system (fig/figwheel-system preferred-config)
:css-watcher (fig/css-watcher {:watch-paths ["resources/public/css"]})))
(println "STARTING FIGWHEEL ON BUILDS: " build-ids)
(swap! figwheel component/start)
(fig/cljs-repl (:figwheel-system @figwheel)))))
"Start Figwheel on the given builds, or defaults to build-ids in `figwheel-config`."
([]
(let [props (System/getProperties)
figwheel-config (fig/fetch-config)
all-builds (->> figwheel-config :data :all-builds (mapv :id))]
(start-figwheel (keys (select-keys props all-builds)))))
([build-ids]
(let [figwheel-config (fig/fetch-config)
default-build-ids (-> figwheel-config :data :build-ids)
build-ids (if (empty? build-ids) default-build-ids build-ids)
preferred-config (assoc-in figwheel-config [:data :build-ids] build-ids)]
(reset! figwheel (component/system-map
:figwheel-system (fig/figwheel-system preferred-config)
:css-watcher (fig/css-watcher {:watch-paths ["resources/public/css"]})))
(println "STARTING FIGWHEEL ON BUILDS: " build-ids)
(swap! figwheel component/start)
(fig/cljs-repl (:figwheel-system @figwheel)))))
2 changes: 1 addition & 1 deletion recipes/css/project.clj
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
(defproject untangled/demo "1.0.0"
(defproject untangled/css "1.0.0"
:description "Untangled Cookbook Recipe"
:url ""
:license {:name "MIT"
Expand Down
4 changes: 2 additions & 2 deletions recipes/error-handling/project.clj
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
(defproject untangled/demo "1.0.0"
(defproject untangled/error-handling "1.0.0"
:description "Untangled Cookbook Recipe"
:url ""
:license {:name "MIT"
Expand All @@ -11,7 +11,7 @@
[org.clojure/clojurescript "1.8.51"]
[org.omcljs/om "1.0.0-alpha41"]
[binaryage/devtools "0.5.2"]
[figwheel-sidecar "0.5.3-1" :exclusions [ring/ring-core joda-time org.clojure/tools.reader]]
[figwheel-sidecar "0.5.9" :exclusions [ring/ring-core joda-time org.clojure/tools.reader]]
[com.cemerick/piggieback "0.2.1"]
[org.clojure/tools.nrepl "0.2.12"]
[juxt/dirwatch "0.2.3"]
Expand Down
4 changes: 2 additions & 2 deletions recipes/initial-app-state/project.clj
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
(defproject untangled/demo "1.0.0"
(defproject untangled/initial-app-state "1.0.0"
:description "Untangled Cookbook Recipe"
:url ""
:license {:name "MIT"
Expand All @@ -11,7 +11,7 @@
[org.clojure/clojurescript "1.8.51"]
[org.omcljs/om "1.0.0-alpha41"]
[binaryage/devtools "0.5.2"]
[figwheel-sidecar "0.5.3-1" :exclusions [ring/ring-core joda-time org.clojure/tools.reader]]
[figwheel-sidecar "0.5.9" :exclusions [ring/ring-core joda-time org.clojure/tools.reader]]
[com.cemerick/piggieback "0.2.1"]
[org.clojure/tools.nrepl "0.2.12"]
[juxt/dirwatch "0.2.3"]
Expand Down
4 changes: 2 additions & 2 deletions recipes/lazy-loading-visual-indicators/project.clj
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
(defproject untangled/demo "1.0.0"
(defproject untangled/lazy-loading-visual-indicators "1.0.0"
:description "Untangled Cookbook Recipe"
:url ""
:license {:name "MIT"
Expand All @@ -11,7 +11,7 @@
[org.clojure/clojurescript "1.8.51"]
[org.omcljs/om "1.0.0-alpha41"]
[binaryage/devtools "0.5.2"]
[figwheel-sidecar "0.5.3-1" :exclusions [ring/ring-core joda-time org.clojure/tools.reader]]
[figwheel-sidecar "0.5.9" :exclusions [ring/ring-core joda-time org.clojure/tools.reader]]
[com.cemerick/piggieback "0.2.1"]
[org.clojure/tools.nrepl "0.2.12"]
[com.google.guava/guava "19.0"]
Expand Down
29 changes: 14 additions & 15 deletions recipes/lists/dev/server/user.clj
Original file line number Diff line number Diff line change
@@ -1,29 +1,28 @@
(ns user
(:require
[clojure.pprint :refer (pprint)]
[clojure.stacktrace :refer (print-stack-trace)]
[clojure.tools.namespace.repl :refer [disable-reload! refresh clear set-refresh-dirs]]
[figwheel-sidecar.repl-api :as ra]
))
[figwheel-sidecar.system :as fig]
[com.stuartsierra.component :as component]))

;;FIGWHEEL

(def figwheel-config
{:figwheel-options {:css-dirs ["resources/public/css"]}
:build-ids ["dev"]
:all-builds (figwheel-sidecar.repl/get-project-cljs-builds)})
(def figwheel (atom nil))

(defn start-figwheel
"Start Figwheel on the given builds, or defaults to build-ids in `figwheel-config`."
([]
(let [props (System/getProperties)
all-builds (->> figwheel-config :all-builds (mapv :id))]
figwheel-config (fig/fetch-config)
all-builds (->> figwheel-config :data :all-builds (mapv :id))]
(start-figwheel (keys (select-keys props all-builds)))))
([build-ids]
(let [default-build-ids (:build-ids figwheel-config)
build-ids (if (empty? build-ids) default-build-ids build-ids)]
(let [figwheel-config (fig/fetch-config)
default-build-ids (-> figwheel-config :data :build-ids)
build-ids (if (empty? build-ids) default-build-ids build-ids)
preferred-config (assoc-in figwheel-config [:data :build-ids] build-ids)]
(reset! figwheel (component/system-map
:figwheel-system (fig/figwheel-system preferred-config)
:css-watcher (fig/css-watcher {:watch-paths ["resources/public/css"]})))
(println "STARTING FIGWHEEL ON BUILDS: " build-ids)
(ra/start-figwheel! (assoc figwheel-config :build-ids build-ids))
(ra/cljs-repl))))
(swap! figwheel component/start)
(fig/cljs-repl (:figwheel-system @figwheel)))))


4 changes: 2 additions & 2 deletions recipes/lists/project.clj
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
(defproject untangled/demo "1.0.0"
(defproject untangled/lists "1.0.0"
:description "Untangled Cookbook Recipe"
:url ""
:license {:name "MIT"
Expand All @@ -11,7 +11,7 @@
[org.clojure/clojurescript "1.8.51"]
[org.omcljs/om "1.0.0-alpha41"]
[binaryage/devtools "0.5.2"]
[figwheel-sidecar "0.5.3-1" :exclusions [ring/ring-core joda-time org.clojure/tools.reader]]
[figwheel-sidecar "0.5.9" :exclusions [ring/ring-core joda-time org.clojure/tools.reader]]
[com.cemerick/piggieback "0.2.1"]
[org.clojure/tools.nrepl "0.2.12"]
[juxt/dirwatch "0.2.3"]
Expand Down
4 changes: 2 additions & 2 deletions recipes/load-samples/project.clj
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
(defproject untangled/demo "1.0.0"
(defproject untangled/load-samples "1.0.0"
:description "Untangled Cookbook Recipe"
:url ""
:license {:name "MIT"
Expand All @@ -9,7 +9,7 @@
[org.clojure/clojurescript "1.9.293"]
[org.omcljs/om "1.0.0-alpha47"]
[binaryage/devtools "0.5.2"]
[figwheel-sidecar "0.5.7"]
[figwheel-sidecar "0.5.9"]
[com.cemerick/piggieback "0.2.1"]
[org.clojure/tools.nrepl "0.2.12"]
[org.clojure/core.async "0.2.391"]
Expand Down
2 changes: 1 addition & 1 deletion recipes/mutation-return-value/project.clj
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
[org.clojure/clojurescript "1.9.293"]
[org.omcljs/om "1.0.0-alpha47"]
[binaryage/devtools "0.5.2"]
[figwheel-sidecar "0.5.7"]
[figwheel-sidecar "0.5.9"]
[com.cemerick/piggieback "0.2.1"]
[org.clojure/tools.nrepl "0.2.12"]
[org.clojure/core.async "0.2.391"]
Expand Down
4 changes: 2 additions & 2 deletions recipes/paginate-large-lists/project.clj
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
(defproject untangled/demo "1.0.0"
(defproject untangled/paginate-large-lists "1.0.0"
:description "Untangled Cookbook Recipe"
:url ""
:license {:name "MIT"
Expand All @@ -11,7 +11,7 @@
[org.clojure/clojurescript "1.8.51"]
[org.omcljs/om "1.0.0-alpha41"]
[binaryage/devtools "0.5.2"]
[figwheel-sidecar "0.5.3-1" :exclusions [ring/ring-core joda-time org.clojure/tools.reader]]
[figwheel-sidecar "0.5.9" :exclusions [ring/ring-core joda-time org.clojure/tools.reader]]
[com.cemerick/piggieback "0.2.1"]
[org.clojure/tools.nrepl "0.2.12"]
[juxt/dirwatch "0.2.3"]
Expand Down
4 changes: 2 additions & 2 deletions recipes/recipe-template/project.clj
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
(defproject untangled/demo "1.0.0"
(defproject untangled/recipe-template-change-me "1.0.0"
:description "Untangled Cookbook Recipe"
:url ""
:license {:name "MIT"
Expand All @@ -9,7 +9,7 @@
[org.clojure/clojurescript "1.9.293"]
[org.omcljs/om "1.0.0-alpha47"]
[binaryage/devtools "0.5.2"]
[figwheel-sidecar "0.5.7"]
[figwheel-sidecar "0.5.9"]
[com.cemerick/piggieback "0.2.1"]
[org.clojure/tools.nrepl "0.2.12"]
[org.clojure/core.async "0.2.391"]
Expand Down
24 changes: 13 additions & 11 deletions recipes/server-query-security/dev/server/user.clj
Original file line number Diff line number Diff line change
Expand Up @@ -2,31 +2,33 @@
(:require
[clojure.pprint :refer (pprint)]
[clojure.stacktrace :refer (print-stack-trace)]
[clojure.tools.namespace.repl :refer [disable-reload! refresh clear set-refresh-dirs]]
[clojure.tools.namespace.repl :refer [refresh clear set-refresh-dirs]]
[com.stuartsierra.component :as component]
[figwheel-sidecar.repl-api :as ra]
[figwheel-sidecar.system :as fig]
[app.system :as sys]
[taoensso.timbre :as timbre]))

;;FIGWHEEL

(def figwheel-config
{:figwheel-options {:css-dirs ["resources/public/css"]}
:build-ids ["dev"]
:all-builds (figwheel-sidecar.repl/get-project-cljs-builds)})
(def figwheel (atom nil))

(defn start-figwheel
"Start Figwheel on the given builds, or defaults to build-ids in `figwheel-config`."
([]
(let [props (System/getProperties)
figwheel-config (fig/fetch-config)
all-builds (->> figwheel-config :all-builds (mapv :id))]
(start-figwheel (keys (select-keys props all-builds)))))
([build-ids]
(let [default-build-ids (:build-ids figwheel-config)
build-ids (if (empty? build-ids) default-build-ids build-ids)]
(let [figwheel-config (fig/fetch-config)
default-build-ids (-> figwheel-config :data :build-ids)
build-ids (if (empty? build-ids) default-build-ids build-ids)
preferred-config (assoc-in figwheel-config [:data :build-ids] build-ids)]
(reset! figwheel (component/system-map
:figwheel-system (fig/figwheel-system preferred-config)
:css-watcher (fig/css-watcher {:watch-paths ["resources/public/css"]})))
(println "STARTING FIGWHEEL ON BUILDS: " build-ids)
(ra/start-figwheel! (assoc figwheel-config :build-ids build-ids))
(ra/cljs-repl))))
(swap! figwheel component/start)
(fig/cljs-repl (:figwheel-system @figwheel)))))

(set-refresh-dirs "src/server" "dev/server")

Expand Down
4 changes: 2 additions & 2 deletions recipes/server-query-security/project.clj
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
(defproject untangled/demo "1.0.0"
(defproject untangled/server-query-security "1.0.0"
:description "Untangled Cookbook Recipe"
:url ""
:license {:name "MIT"
Expand All @@ -12,7 +12,7 @@
[org.clojure/clojurescript "1.9.293"]
[org.omcljs/om "1.0.0-alpha47"]
[binaryage/devtools "0.5.2"]
[figwheel-sidecar "0.5.3-1" :exclusions [ring/ring-core joda-time org.clojure/tools.reader]]
[figwheel-sidecar "0.5.9" :exclusions [ring/ring-core joda-time org.clojure/tools.reader]]
[com.cemerick/piggieback "0.2.1"]
[org.clojure/tools.nrepl "0.2.12"]
[juxt/dirwatch "0.2.3"]
Expand Down
2 changes: 1 addition & 1 deletion recipes/sql/project.clj
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
[org.clojure/clojurescript "1.9.293"]
[org.omcljs/om "1.0.0-alpha47"]
[binaryage/devtools "0.5.2"]
[figwheel-sidecar "0.5.7"]
[figwheel-sidecar "0.5.9"]
[com.cemerick/piggieback "0.2.1"]
[org.clojure/tools.nrepl "0.2.12"]
[org.clojure/core.async "0.2.391"]
Expand Down
4 changes: 2 additions & 2 deletions recipes/tabbed-interface/project.clj
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
(defproject untangled/demo "1.0.0"
(defproject untangled/tabbed-interface "1.0.0"
:description "Untangled Cookbook Recipe"
:url ""
:license {:name "MIT"
Expand Down Expand Up @@ -37,7 +37,7 @@
:repl-options {:init-ns clj.user
:nrepl-middleware [cemerick.piggieback/wrap-cljs-repl]}
:env {:dev true}
:dependencies [[figwheel-sidecar "0.5.7"]
:dependencies [[figwheel-sidecar "0.5.9"]
[binaryage/devtools "0.5.2"]
[figwheel-sidecar "0.5.7" :exclusions [ring/ring-core org.clojure/tools.analyzer.jvm joda-time org.clojure/tools.reader]]
[com.cemerick/piggieback "0.2.1"]
Expand Down
4 changes: 2 additions & 2 deletions recipes/websockets/project.clj
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
(defproject untangled/demo "1.0.0"
(defproject untangled/websockets "1.0.0"
:description "Untangled Cookbook Recipe"
:url ""
:license {:name "MIT"
Expand All @@ -11,7 +11,7 @@
[org.clojure/clojurescript "1.8.51"]
[org.omcljs/om "1.0.0-alpha41"]
[binaryage/devtools "0.5.2"]
[figwheel-sidecar "0.5.3" :exclusions [ring/ring-core joda-time org.clojure/tools.reader]]
[figwheel-sidecar "0.5.9" :exclusions [ring/ring-core joda-time org.clojure/tools.reader]]
[com.cemerick/piggieback "0.2.1"]
[org.clojure/tools.nrepl "0.2.12"]
[juxt/dirwatch "0.2.3"]
Expand Down

0 comments on commit b7c183d

Please sign in to comment.