From 31ff6f7a985dd6af6ff3ab742c12e812b77be24f Mon Sep 17 00:00:00 2001
From: Ali Abrar <ali.abrar@obsidian.systems>
Date: Fri, 12 Jan 2024 10:45:37 -0400
Subject: [PATCH 1/2] Fixes for upcoming reflex 0.9.3.0

---
 test/Main.hs | 57 ++++++++++++++++++++++++++++------------------------
 1 file changed, 31 insertions(+), 26 deletions(-)

diff --git a/test/Main.hs b/test/Main.hs
index 2afa197..24a3743 100644
--- a/test/Main.hs
+++ b/test/Main.hs
@@ -31,34 +31,40 @@ main = hspec $ do
       timeoutWrapperAsync (checkFRPBlocking $ P.proc "cat" []) `shouldReturn` Right (Just Exit)
     it "isn't blocked by a downstream blocking process" $ do
       timeoutWrapperAsync (checkFRPBlocking $ P.proc "sleep" ["infinity"]) `shouldReturn` Right (Just Exit)
-    it "sends messages on stdin and receives messages on stdout and stderr" $ runHeadlessApp $ do
-      let
-        -- Produces an event when the given message is seen on both stdout and stderr of the given process events
-        getSawMessage procOut msg = do
-          let filterMsg = mapMaybe (guard . (== msg))
-          seen <- foldDyn ($) (False, False) $
-            mergeWith (.)
-              [ first (const True) <$ filterMsg (_process_stdout procOut)
-              , second (const True) <$ filterMsg (_process_stderr procOut)
-              ]
-          pure $ mapMaybe (guard . (== (True, True))) $ updated seen
-
-      rec
-        procOut <- createProcess (P.proc "tee" ["/dev/stderr"]) $ ProcessConfig send never
-        aWasSeen <- getSawMessage procOut "a\n"
-        bWasSeen <- getSawMessage procOut "b\n"
-        pb <- getPostBuild
+    it "sends messages on stdin and receives messages on stdout and stderr" $ do
+      () <- runHeadlessApp $ do
         let
-          send = leftmost
-            [ SendPipe_Message "a\n" <$ pb
-            , SendPipe_Message "b\n" <$ aWasSeen
-            , SendPipe_LastMessage "c\n" <$ bWasSeen
-            ]
+          -- Produces an event when the given message is seen on both stdout and stderr of the given process events
+          getSawMessage procOut msg = do
+            let filterMsg = mapMaybe (guard . (== msg))
+            seen <- foldDyn ($) (False, False) $
+              mergeWith (.)
+                [ first (const True) <$ filterMsg (_process_stdout procOut)
+                , second (const True) <$ filterMsg (_process_stderr procOut)
+                ]
+            pure $ mapMaybe (guard . (== (True, True))) $ updated seen
+
+        rec
+          procOut <- createProcess (P.proc "tee" ["/dev/stderr"]) $ ProcessConfig send never
+          aWasSeen <- getSawMessage procOut "a\n"
+          bWasSeen <- getSawMessage procOut "b\n"
+          pb <- getPostBuild
+          let
+            send = leftmost
+              [ SendPipe_Message "a\n" <$ pb
+              , SendPipe_Message "b\n" <$ aWasSeen
+              , SendPipe_LastMessage "c\n" <$ bWasSeen
+              ]
 
-      getSawMessage procOut "c\n"
+        getSawMessage procOut "c\n"
+      pure ()
 
-    it "sends signals" $ runHeadlessApp $ void . _process_exit <$> sendSignalTest
-    it "fires event when signal is sent" $ runHeadlessApp $ void . _process_signal <$> sendSignalTest
+    it "sends signals" $ do
+      () <- runHeadlessApp $ void . _process_exit <$> sendSignalTest
+      pure ()
+    it "fires event when signal is sent" $ do
+      () <- runHeadlessApp $ void . _process_signal <$> sendSignalTest
+      pure ()
 
   where
     sendSignalTest :: MonadHeadlessApp t m => m (Process t ByteString ByteString)
@@ -68,7 +74,6 @@ main = hspec $ do
       liftIO $ threadDelay 1000000 *> signalTrigger 15 -- SIGTERM
       pure procOut
 
-
 -- This datatype signals that the FRP network was able to exit on its own.
 data Exit = Exit deriving (Show, Eq)
 

From 469712d48d7f6bf3c1d8d3d27af20948240d2a6d Mon Sep 17 00:00:00 2001
From: Ali Abrar <ali.abrar@obsidian.systems>
Date: Tue, 16 Jan 2024 16:37:19 -0400
Subject: [PATCH 2/2] Add support for reflex-0.9.3

---
 ChangeLog.md         | 4 ++++
 reflex-process.cabal | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/ChangeLog.md b/ChangeLog.md
index ef68095..d0b508b 100644
--- a/ChangeLog.md
+++ b/ChangeLog.md
@@ -1,5 +1,9 @@
 # Revision history for reflex-process
 
+## 0.3.3.1
+
+* Support for reflex-0.9.3
+
 ## 0.3.3.0
 
 * Add `Lines` for keeping track of accumulated output, including both terminated and unterminated lines
diff --git a/reflex-process.cabal b/reflex-process.cabal
index d714350..994b5bb 100644
--- a/reflex-process.cabal
+++ b/reflex-process.cabal
@@ -1,6 +1,6 @@
 cabal-version: >=1.10
 name: reflex-process
-version: 0.3.3.0
+version: 0.3.3.1
 synopsis: Reflex FRP interface for running system processes
 description:
   Run and interact with system processes from within a Reflex FRP application.