use re-frame 0.8.0 in reagent6 template

drapanjanas · Aug 7, 2016 · e52b9cd · e52b9cd
1 parent a61dc5d
commit e52b9cd
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 12 deletions.
diff --git a/re-natal.coffee b/re-natal.coffee
@@ -51,10 +51,10 @@ interfaceConf   =
     sources:
       ios:     ["core.cljs"]
       android: ["core.cljs"]
-      common:  ["handlers.cljs", "subs.cljs", "db.cljs"]
+      common:  ["events.cljs", "subs.cljs", "db.cljs"]
       other:   [["reagent_dom.cljs","reagent/dom.cljs"], ["reagent_dom_server.cljs","reagent/dom/server.cljs"]]
     deps:      ['[reagent "0.6.0-rc" :exclusions [cljsjs/react cljsjs/react-dom cljsjs/react-dom-server]]'
-      '[re-frame "0.7.0"]']
+      '[re-frame "0.8.0-alpha9"]']
     shims:     ["cljsjs.react", "cljsjs.react.dom", "cljsjs.react.dom.server"]
     sampleCommandNs: '(in-ns \'$PROJECT_NAME_HYPHENATED$.ios.core)'
     sampleCommand: '(dispatch [:set-greeting "Hello Native World!"])'

diff --git a/resources/cljs-reagent6/core.cljs b/resources/cljs-reagent6/core.cljs
@@ -1,7 +1,7 @@
 (ns $PROJECT_NAME_HYPHENATED$.$PLATFORM$.core
   (:require [reagent.core :as r :refer [atom]]
             [re-frame.core :refer [subscribe dispatch dispatch-sync]]
-            [$PROJECT_NAME_HYPHENATED$.handlers]
+            [$PROJECT_NAME_HYPHENATED$.events]
             [$PROJECT_NAME_HYPHENATED$.subs]))
 
 (def ReactNative (js/require "react-native"))

diff --git a/resources/cljs-reagent6/handlers.cljs → resources/cljs-reagent6/events.cljs b/resources/cljs-reagent6/handlers.cljs → resources/cljs-reagent6/events.cljs
@@ -1,6 +1,6 @@
-(ns $PROJECT_NAME_HYPHENATED$.handlers
+(ns $PROJECT_NAME_HYPHENATED$.events
   (:require
-    [re-frame.core :refer [register-handler after]]
+    [re-frame.core :refer [reg-event after]]
     [cljs.spec :as s]
     [$PROJECT_NAME_HYPHENATED$.db :as db :refer [app-db]]))
 
@@ -22,13 +22,13 @@
 
 ;; -- Handlers --------------------------------------------------------------
 
-(register-handler
+(reg-event
   :initialize-db
   validate-spec-mw
   (fn [_ _]
     app-db))
 
-(register-handler
+(reg-event
   :set-greeting
   validate-spec-mw
   (fn [db [_ value]]

diff --git a/resources/cljs-reagent6/subs.cljs b/resources/cljs-reagent6/subs.cljs
@@ -1,9 +1,7 @@
 (ns $PROJECT_NAME_HYPHENATED$.subs
-  (:require-macros [reagent.ratom :refer [reaction]])
-  (:require [re-frame.core :refer [register-sub]]))
+  (:require [re-frame.core :refer [reg-sub]]))
 
-(register-sub
+(reg-sub
   :get-greeting
   (fn [db _]
-    (reaction
-      (get @db :greeting))))
+    (:greeting db)))