Change reaction -> elmish streams

SAFE-Stack · May 10, 2019 · 23590af · 23590af
1 parent 794c5cc
commit 23590af
Show file tree

Hide file tree

Showing 11 changed files with 61 additions and 56 deletions.
diff --git a/Content/paket.dependencies b/Content/paket.dependencies
@@ -38,7 +38,7 @@ group Client
     nuget Fable.Elmish.HMR ~> 4
     nuget Fable.Elmish.React ~> 3
 //#if (reaction)
-    nuget Fable.Elmish.Reaction ~> 3
+    nuget Fable.Elmish.Streams ~> 3
 //#endif
 //#if (!remoting)
     nuget Fable.Fetch ~> 2

diff --git a/Content/src/Client/Client.fs b/Content/src/Client/Client.fs
@@ -2,6 +2,10 @@ module Client
 
 open Elmish
 open Elmish.React
+#if (reaction)
+open Elmish.Streams
+open FSharp.Control
+#endif
 #if (layout == "fulma-admin" || layout == "fulma-cover" || layout == "fulma-hero" || layout == "fulma-landing" || layout == "fulma-login")
 open Fable.FontAwesome
 open Fable.FontAwesome.Free
@@ -14,9 +18,6 @@ open Fetch.Types
 #if (layout != "none")
 open Fulma
 #endif
-#if (reaction)
-open Reaction
-#endif
 open Thoth.Json
 
 open Shared
@@ -142,8 +143,12 @@ let load = AsyncRx.ofPromise (initialCounter [])
 let loadCount =
     load
     |> AsyncRx.map InitialCountLoaded
+    |> AsyncRx.toStream "loading"
 
-let query msgs = loadCount ++ msgs
+let stream model msgs =
+    match model.Counter with
+    | None -> loadCount
+    | _ -> msgs
 #endif
 
 #if (reaction)
@@ -204,7 +209,7 @@ let safeComponents =
 #endif
 #if (reaction)
              str ", "
-             a [ Href "https://dbrattli.github.io/Reaction/" ] [ str "Fable.Reaction" ]
+             a [ Href "http://elmish-streams.rtfd.io/" ] [ str "Elmish.Streams" ]
 #endif
 #if (remoting)
              str ", "
@@ -893,7 +898,7 @@ open Elmish.HMR
 //+:cnd:noEmit
 #if (reaction)
 Program.mkSimple init update view
-|> Program.withQuery query
+|> Program.withStreams stream "msgs"
 #else
 Program.mkProgram init update view
 #endif

diff --git a/Content/src/Client/paket.references b/Content/src/Client/paket.references
@@ -4,7 +4,7 @@ group Client
     Fable.Elmish.Debugger
     Fable.Elmish.React
 //#if (reaction)
-    Fable.Elmish.Reaction
+    Fable.Elmish.Streams
 //#endif
     Fable.Elmish.HMR
 //#if (remoting)

diff --git a/Content/src/Client/paket_noremoting-fulma-noreaction.lock b/Content/src/Client/paket_noremoting-fulma-noreaction.lock
@@ -29,7 +29,7 @@ NUGET
       Fable.Core (>= 3.0)
       Fable.Elmish (>= 3.0)
       FSharp.Core (>= 4.6.2)
-    Fable.Elmish.Debugger (3.0)
+    Fable.Elmish.Debugger (3.0.1)
       Fable.Core (>= 3.0)
       Fable.Elmish (>= 3.0)
       FSharp.Core (>= 4.6.2)
@@ -59,15 +59,15 @@ NUGET
     Fable.Promise (2.0)
       Fable.Core (>= 3.0)
       FSharp.Core (>= 4.5.2)
-    Fable.React (5.1)
+    Fable.React (5.2.3)
       Fable.Browser.Dom (>= 1.0)
       Fable.Core (>= 3.0)
       FSharp.Core (>= 4.6.2)
     FSharp.Core (4.6.2)
-    Fulma (2.0)
+    Fulma (2.1)
       Fable.Core (>= 3.0)
       Fable.React (>= 5.1)
-    Thoth.Json (3.0)
+    Thoth.Json (3.1)
       Fable.Core (>= 3.0)
       FSharp.Core (>= 4.6.2)
 
diff --git a/Content/src/Client/paket_noremoting-fulma-reaction.lock b/Content/src/Client/paket_noremoting-fulma-reaction.lock
@@ -33,7 +33,7 @@ NUGET
       Fable.Core (>= 3.0)
       Fable.Elmish (>= 3.0)
       FSharp.Core (>= 4.6.2)
-    Fable.Elmish.Debugger (3.0)
+    Fable.Elmish.Debugger (3.0.1)
       Fable.Core (>= 3.0)
       Fable.Elmish (>= 3.0)
       FSharp.Core (>= 4.6.2)
@@ -48,14 +48,14 @@ NUGET
       Fable.Elmish (>= 3.0)
       Fable.React (>= 5.1)
       FSharp.Core (>= 4.6.2)
-    Fable.Elmish.Reaction (3.0)
+    Fable.Elmish.Streams (3.0.3)
       Fable.Browser.Event (>= 1.0)
       Fable.Browser.WebSocket (>= 1.0)
       Fable.Core (>= 3.0)
       Fable.Elmish (>= 3.0)
       Fable.React (>= 5.1)
+      FSharp.Control.AsyncRx (>= 1.0)
       FSharp.Core (>= 4.6.2)
-      Reaction.AsyncRx (>= 2.1)
     Fable.Fetch (2.0)
       Fable.Browser.Blob (>= 1.0)
       Fable.Core (>= 3.0)
@@ -71,20 +71,20 @@ NUGET
     Fable.Promise (2.0)
       Fable.Core (>= 3.0)
       FSharp.Core (>= 4.5.2)
-    Fable.React (5.1)
+    Fable.React (5.2.3)
       Fable.Browser.Dom (>= 1.0)
       Fable.Core (>= 3.0)
       FSharp.Core (>= 4.6.2)
+    FSharp.Control.AsyncRx (1.0)
+      FSharp.Control.AsyncSeq (>= 2.0.21)
+      FSharp.Core (>= 4.5.4)
     FSharp.Control.AsyncSeq (2.0.21)
       FSharp.Core (>= 4.3.2)
     FSharp.Core (4.6.2)
-    Fulma (2.0)
+    Fulma (2.1)
       Fable.Core (>= 3.0)
       Fable.React (>= 5.1)
-    Reaction.AsyncRx (2.1)
-      FSharp.Control.AsyncSeq (>= 2.0.21)
-      FSharp.Core (>= 4.5.4)
-    Thoth.Json (3.0)
+    Thoth.Json (3.1)
       Fable.Core (>= 3.0)
       FSharp.Core (>= 4.6.2)
 
diff --git a/Content/src/Client/paket_noremoting-nofulma-noreaction.lock b/Content/src/Client/paket_noremoting-nofulma-noreaction.lock
@@ -29,7 +29,7 @@ NUGET
       Fable.Core (>= 3.0)
       Fable.Elmish (>= 3.0)
       FSharp.Core (>= 4.6.2)
-    Fable.Elmish.Debugger (3.0)
+    Fable.Elmish.Debugger (3.0.1)
       Fable.Core (>= 3.0)
       Fable.Elmish (>= 3.0)
       FSharp.Core (>= 4.6.2)
@@ -52,12 +52,12 @@ NUGET
     Fable.Promise (2.0)
       Fable.Core (>= 3.0)
       FSharp.Core (>= 4.5.2)
-    Fable.React (5.1)
+    Fable.React (5.2.3)
       Fable.Browser.Dom (>= 1.0)
       Fable.Core (>= 3.0)
       FSharp.Core (>= 4.6.2)
     FSharp.Core (4.6.2)
-    Thoth.Json (3.0)
+    Thoth.Json (3.1)
       Fable.Core (>= 3.0)
       FSharp.Core (>= 4.6.2)
 
diff --git a/Content/src/Client/paket_noremoting-nofulma-reaction.lock b/Content/src/Client/paket_noremoting-nofulma-reaction.lock
@@ -33,7 +33,7 @@ NUGET
       Fable.Core (>= 3.0)
       Fable.Elmish (>= 3.0)
       FSharp.Core (>= 4.6.2)
-    Fable.Elmish.Debugger (3.0)
+    Fable.Elmish.Debugger (3.0.1)
       Fable.Core (>= 3.0)
       Fable.Elmish (>= 3.0)
       FSharp.Core (>= 4.6.2)
@@ -48,14 +48,14 @@ NUGET
       Fable.Elmish (>= 3.0)
       Fable.React (>= 5.1)
       FSharp.Core (>= 4.6.2)
-    Fable.Elmish.Reaction (3.0)
+    Fable.Elmish.Streams (3.0.3)
       Fable.Browser.Event (>= 1.0)
       Fable.Browser.WebSocket (>= 1.0)
       Fable.Core (>= 3.0)
       Fable.Elmish (>= 3.0)
       Fable.React (>= 5.1)
+      FSharp.Control.AsyncRx (>= 1.0)
       FSharp.Core (>= 4.6.2)
-      Reaction.AsyncRx (>= 2.1)
     Fable.Fetch (2.0)
       Fable.Browser.Blob (>= 1.0)
       Fable.Core (>= 3.0)
@@ -64,17 +64,17 @@ NUGET
     Fable.Promise (2.0)
       Fable.Core (>= 3.0)
       FSharp.Core (>= 4.5.2)
-    Fable.React (5.1)
+    Fable.React (5.2.3)
       Fable.Browser.Dom (>= 1.0)
       Fable.Core (>= 3.0)
       FSharp.Core (>= 4.6.2)
+    FSharp.Control.AsyncRx (1.0)
+      FSharp.Control.AsyncSeq (>= 2.0.21)
+      FSharp.Core (>= 4.5.4)
     FSharp.Control.AsyncSeq (2.0.21)
       FSharp.Core (>= 4.3.2)
     FSharp.Core (4.6.2)
-    Reaction.AsyncRx (2.1)
-      FSharp.Control.AsyncSeq (>= 2.0.21)
-      FSharp.Core (>= 4.5.4)
-    Thoth.Json (3.0)
+    Thoth.Json (3.1)
       Fable.Core (>= 3.0)
       FSharp.Core (>= 4.6.2)
 
diff --git a/Content/src/Client/paket_remoting-fulma-noreaction.lock b/Content/src/Client/paket_remoting-fulma-noreaction.lock
@@ -29,7 +29,7 @@ NUGET
       Fable.Core (>= 3.0)
       Fable.Elmish (>= 3.0)
       FSharp.Core (>= 4.6.2)
-    Fable.Elmish.Debugger (3.0)
+    Fable.Elmish.Debugger (3.0.1)
       Fable.Core (>= 3.0)
       Fable.Elmish (>= 3.0)
       FSharp.Core (>= 4.6.2)
@@ -56,7 +56,7 @@ NUGET
     Fable.Parsimmon (4.0)
       Fable.Core (>= 3.0)
       FSharp.Core (>= 4.6.2)
-    Fable.React (5.1)
+    Fable.React (5.2.3)
       Fable.Browser.Dom (>= 1.0)
       Fable.Core (>= 3.0)
       FSharp.Core (>= 4.6.2)
@@ -70,10 +70,10 @@ NUGET
       Fable.Parsimmon (>= 4.0)
       FSharp.Core (>= 4.6.2)
     FSharp.Core (4.6.2)
-    Fulma (2.0)
+    Fulma (2.1)
       Fable.Core (>= 3.0)
       Fable.React (>= 5.1)
-    Thoth.Json (3.0)
+    Thoth.Json (3.1)
       Fable.Core (>= 3.0)
       FSharp.Core (>= 4.6.2)
 
diff --git a/Content/src/Client/paket_remoting-fulma-reaction.lock b/Content/src/Client/paket_remoting-fulma-reaction.lock
@@ -33,7 +33,7 @@ NUGET
       Fable.Core (>= 3.0)
       Fable.Elmish (>= 3.0)
       FSharp.Core (>= 4.6.2)
-    Fable.Elmish.Debugger (3.0)
+    Fable.Elmish.Debugger (3.0.1)
       Fable.Core (>= 3.0)
       Fable.Elmish (>= 3.0)
       FSharp.Core (>= 4.6.2)
@@ -48,14 +48,14 @@ NUGET
       Fable.Elmish (>= 3.0)
       Fable.React (>= 5.1)
       FSharp.Core (>= 4.6.2)
-    Fable.Elmish.Reaction (3.0)
+    Fable.Elmish.Streams (3.0.3)
       Fable.Browser.Event (>= 1.0)
       Fable.Browser.WebSocket (>= 1.0)
       Fable.Core (>= 3.0)
       Fable.Elmish (>= 3.0)
       Fable.React (>= 5.1)
+      FSharp.Control.AsyncRx (>= 1.0)
       FSharp.Core (>= 4.6.2)
-      Reaction.AsyncRx (>= 2.1)
     Fable.FontAwesome (2.0)
       Fable.Core (>= 3.0)
       Fable.React (>= 5.1)
@@ -68,7 +68,7 @@ NUGET
     Fable.Parsimmon (4.0)
       Fable.Core (>= 3.0)
       FSharp.Core (>= 4.6.2)
-    Fable.React (5.1)
+    Fable.React (5.2.3)
       Fable.Browser.Dom (>= 1.0)
       Fable.Core (>= 3.0)
       FSharp.Core (>= 4.6.2)
@@ -81,16 +81,16 @@ NUGET
       Fable.Core (>= 3.0)
       Fable.Parsimmon (>= 4.0)
       FSharp.Core (>= 4.6.2)
+    FSharp.Control.AsyncRx (1.0)
+      FSharp.Control.AsyncSeq (>= 2.0.21)
+      FSharp.Core (>= 4.5.4)
     FSharp.Control.AsyncSeq (2.0.21)
       FSharp.Core (>= 4.3.2)
     FSharp.Core (4.6.2)
-    Fulma (2.0)
+    Fulma (2.1)
       Fable.Core (>= 3.0)
       Fable.React (>= 5.1)
-    Reaction.AsyncRx (2.1)
-      FSharp.Control.AsyncSeq (>= 2.0.21)
-      FSharp.Core (>= 4.5.4)
-    Thoth.Json (3.0)
+    Thoth.Json (3.1)
       Fable.Core (>= 3.0)
       FSharp.Core (>= 4.6.2)
 
diff --git a/Content/src/Client/paket_remoting-nofulma-noreaction.lock b/Content/src/Client/paket_remoting-nofulma-noreaction.lock
@@ -29,7 +29,7 @@ NUGET
       Fable.Core (>= 3.0)
       Fable.Elmish (>= 3.0)
       FSharp.Core (>= 4.6.2)
-    Fable.Elmish.Debugger (3.0)
+    Fable.Elmish.Debugger (3.0.1)
       Fable.Core (>= 3.0)
       Fable.Elmish (>= 3.0)
       FSharp.Core (>= 4.6.2)
@@ -49,7 +49,7 @@ NUGET
     Fable.Parsimmon (4.0)
       Fable.Core (>= 3.0)
       FSharp.Core (>= 4.6.2)
-    Fable.React (5.1)
+    Fable.React (5.2.3)
       Fable.Browser.Dom (>= 1.0)
       Fable.Core (>= 3.0)
       FSharp.Core (>= 4.6.2)
@@ -63,7 +63,7 @@ NUGET
       Fable.Parsimmon (>= 4.0)
       FSharp.Core (>= 4.6.2)
     FSharp.Core (4.6.2)
-    Thoth.Json (3.0)
+    Thoth.Json (3.1)
       Fable.Core (>= 3.0)
       FSharp.Core (>= 4.6.2)
 
diff --git a/Content/src/Client/paket_remoting-nofulma-reaction.lock b/Content/src/Client/paket_remoting-nofulma-reaction.lock
@@ -33,7 +33,7 @@ NUGET
       Fable.Core (>= 3.0)
       Fable.Elmish (>= 3.0)
       FSharp.Core (>= 4.6.2)
-    Fable.Elmish.Debugger (3.0)
+    Fable.Elmish.Debugger (3.0.1)
       Fable.Core (>= 3.0)
       Fable.Elmish (>= 3.0)
       FSharp.Core (>= 4.6.2)
@@ -48,20 +48,20 @@ NUGET
       Fable.Elmish (>= 3.0)
       Fable.React (>= 5.1)
       FSharp.Core (>= 4.6.2)
-    Fable.Elmish.Reaction (3.0)
+    Fable.Elmish.Streams (3.0.3)
       Fable.Browser.Event (>= 1.0)
       Fable.Browser.WebSocket (>= 1.0)
       Fable.Core (>= 3.0)
       Fable.Elmish (>= 3.0)
       Fable.React (>= 5.1)
+      FSharp.Control.AsyncRx (>= 1.0)
       FSharp.Core (>= 4.6.2)
-      Reaction.AsyncRx (>= 2.1)
     Fable.Import.Browser (1.3)
       Fable.Core (>= 1.3.17)
     Fable.Parsimmon (4.0)
       Fable.Core (>= 3.0)
       FSharp.Core (>= 4.6.2)
-    Fable.React (5.1)
+    Fable.React (5.2.3)
       Fable.Browser.Dom (>= 1.0)
       Fable.Core (>= 3.0)
       FSharp.Core (>= 4.6.2)
@@ -74,13 +74,13 @@ NUGET
       Fable.Core (>= 3.0)
       Fable.Parsimmon (>= 4.0)
       FSharp.Core (>= 4.6.2)
+    FSharp.Control.AsyncRx (1.0)
+      FSharp.Control.AsyncSeq (>= 2.0.21)
+      FSharp.Core (>= 4.5.4)
     FSharp.Control.AsyncSeq (2.0.21)
       FSharp.Core (>= 4.3.2)
     FSharp.Core (4.6.2)
-    Reaction.AsyncRx (2.1)
-      FSharp.Control.AsyncSeq (>= 2.0.21)
-      FSharp.Core (>= 4.5.4)
-    Thoth.Json (3.0)
+    Thoth.Json (3.1)
       Fable.Core (>= 3.0)
       FSharp.Core (>= 4.6.2)