Bump flake

Author: dmjio

.github/workflows/main.yml

@@ -1,9 +1,9 @@
-
 name: Build and deploy
 
 on:
   push:
     branches: main
+  pull_request:
 
 permissions:
   contents: read
@@ -30,6 +30,7 @@ jobs:
           path: ./public
 
   deploy:
+    if: github.ref == 'refs/heads/main'
     runs-on: ubuntu-latest
 
     environment:

cabal.project

@@ -9,5 +9,4 @@ flags: +template-haskell
 source-repository-package
   type: git
   location: https://github.com/dmjio/miso
-  branch: master
-
+  tag: 8c4b85e6e1279bec9b66859c54f25209701b8153

flake.lock

@@ -2,12 +2,27 @@ cabal-version:          3.0
 name:                   miso-websocket
 version:                0.1
 
+common warnings
+  ghc-options:
+    -funbox-strict-fields -O2 -ferror-spans -fspecialise-aggressively -Wall
+
+common wasm
+  if arch(wasm32)
+    ghc-options:
+      -no-hs-main -optl-mexec-model=reactor "-optl-Wl,--export=hs_start"
+    cpp-options:
+      -DWASM
+
 executable app
-  hs-source-dirs:       src
-  main-is:              Main.hs
-  build-depends:        base, aeson, miso, mtl
-  default-language:     GHC2021
-  ghc-options:          -Wall -no-hs-main -optl-mexec-model=reactor "-optl-Wl,--export=hs_start" -ddump-splices
-  cpp-options:          -DWASM
-  default-extensions:   CPP TemplateHaskell
- 
+  import:
+    wasm, warnings
+  hs-source-dirs:
+    src
+  main-is:
+    Main.hs
+  build-depends:
+    base, aeson, miso, mtl
+  default-language:
+    GHC2021
+  default-extensions:
+    CPP TemplateHaskell

miso-websocket.cabal

@@ -1,34 +1,28 @@
+-----------------------------------------------------------------------------
 {-# LANGUAGE CPP                   #-}
-{-# LANGUAGE DeriveGeneric         #-}
-{-# LANGUAGE ExtendedDefaultRules  #-}
-{-# LANGUAGE FlexibleInstances     #-}
-{-# LANGUAGE MultiParamTypeClasses #-}
 {-# LANGUAGE OverloadedStrings     #-}
 {-# LANGUAGE RecordWildCards       #-}
-{-# LANGUAGE ScopedTypeVariables   #-}
-{-# LANGUAGE TypeFamilies          #-}
-
+-----------------------------------------------------------------------------
 module Main where
-
+-----------------------------------------------------------------------------
 import           Control.Monad.State
 import           Data.Aeson
 import           Data.Bool
 import           GHC.Generics
-
+-----------------------------------------------------------------------------
 import           Miso
 import           Miso.String (MisoString)
 import qualified Miso.String as S
-
 import qualified Miso.Style as CSS
-
+-----------------------------------------------------------------------------
 #if WASM
 foreign export javascript "hs_start" main :: IO ()
 #endif
-
+-----------------------------------------------------------------------------
 main :: IO ()
-main = run (startComponent app)
-
-app :: Component Model Action
+main = run (startApp app)
+-----------------------------------------------------------------------------
+app :: App Model Action
 app = (component emptyModel updateModel appView)
   { events = defaultEvents <> keyboardEvents
   , subs =
@@ -37,38 +31,37 @@ app = (component emptyModel updateModel appView)
   } where
       url = URL "wss://echo.websocket.org"
       protocols = Protocols []
-
-
+-----------------------------------------------------------------------------
 emptyModel :: Model
 emptyModel = Model (Message "") mempty
-
-updateModel :: Action -> Effect Model Action
+-----------------------------------------------------------------------------
+updateModel :: Action -> Transition Model Action
 updateModel (HandleWebSocket (WebSocketMessage (Message m))) =
   modify $ \model -> model { received = m }
 updateModel (SendMessage msg) =
   io_ (send msg)
 updateModel (UpdateMessage m) = do
   modify $ \model -> model { msg = Message m }
 updateModel _ = pure ()
-
+-----------------------------------------------------------------------------
 instance ToJSON Message
 instance FromJSON Message
-
+-----------------------------------------------------------------------------
 newtype Message = Message MisoString
   deriving (Eq, Show, Generic)
-
+-----------------------------------------------------------------------------
 data Action
   = HandleWebSocket (WebSocket Message)
   | SendMessage Message
   | UpdateMessage MisoString
   | Id
-
+-----------------------------------------------------------------------------
 data Model = Model
   { msg :: Message
   , received :: MisoString
   } deriving (Show, Eq)
-
-appView :: Model -> View Action
+-----------------------------------------------------------------------------
+appView :: Model -> View Model Action
 appView Model{..} =
     div_
         [ CSS.style_ [ CSS.textAlign "center" ] ]
@@ -91,6 +84,7 @@ appView Model{..} =
             [text (S.pack "Send to echo server")]
         , div_ [] [p_ [] [text received | not . S.null $ received]]
         ]
-
+-----------------------------------------------------------------------------
 onEnter :: Action -> Attribute Action
 onEnter action = onKeyDown $ bool Id action . (== KeyCode 13)
+-----------------------------------------------------------------------------