Update to Purescript v0.15.4 (#32)

Author: jonasbuntinx

package.json

@@ -1,6 +1,6 @@
 {
   "name": "purescript-react-realworld",
-  "version": "3.0.0",
+  "version": "4.0.0",
   "description": "A real-world application demonstrating PureScript and React",
   "keywords": [
     "Purescript",
@@ -32,16 +32,16 @@
   },
   "devDependencies": {
     "parcel": "2.0.0",
-    "purescript": "^0.14.5",
+    "purescript": "^0.15.4",
     "purescript-psa": "^0.8.2",
-    "spago": "^0.20.3",
+    "purs-tidy": "^0.9.2",
+    "spago": "^0.20.9",
     "zephyr": "https://github.com/jonasbuntinx/zephyr.git"
   },
   "dependencies": {
-    "dayjs": "^1.10.7",
+    "dayjs": "^1.11.5",
     "nano-markdown": "^1.2.1",
-    "preact": "^10.5.15",
-    "xhr2": "^0.2.1"
+    "preact": "^10.11.0"
   },
   "alias": {
     "react": "preact/compat",

packages.dhall

@@ -117,22 +117,10 @@ let additions =
 -------------------------------
 -}
 let upstream =
-      https://github.com/purescript/package-sets/releases/download/psc-0.14.2-20210713/packages.dhall sha256:654c3148cb995f642c73b4508d987d9896e2ad3ea1d325a1e826c034c0d3cd7b
+      https://github.com/purescript/package-sets/releases/download/psc-0.15.4-20220901/packages.dhall
+        sha256:f1531b29c21ac437ffe5666c1b6cc76f0a9c29d3c9d107ff047aa2567744994f
 
 let additions =
-      { web-router =
-        { dependencies =
-          [ "aff"
-          , "effect"
-          , "freet"
-          , "indexed-monad"
-          , "prelude"
-          , "profunctor-lenses"
-          , "routing"
-          ]
-        , repo = "https://github.com/robertdp/purescript-web-router.git"
-        , version = "v0.3.0"
-        }
-      }
+      {=}
 
 in  upstream // additions

spago.dhall

@@ -2,6 +2,7 @@
 , dependencies =
   [ "aff"
   , "affjax"
+  , "affjax-web"
   , "argonaut-core"
   , "arrays"
   , "bifunctors"

src/Conduit/Api/Client.purs

@@ -3,7 +3,7 @@ module Conduit.Api.Client where
 import Prelude
 
 import Affjax (defaultRequest)
-import Affjax as Affjax
+import Affjax.Web as Affjax
 import Affjax.RequestBody as RequestBody
 import Affjax.RequestHeader (RequestHeader(..))
 import Affjax.ResponseFormat as ResponseFormat

src/Conduit/AppM.purs

@@ -33,21 +33,20 @@ import Data.Either (Either)
 import Data.Foldable (for_)
 import Data.HTTP.Method (Method(..))
 import Data.Maybe (Maybe(..))
-import Data.Symbol (SProxy(..))
 import Effect.Aff (Aff)
 import Effect.Aff.Class (class MonadAff)
 import Effect.Class (class MonadEffect, liftEffect)
 import Effect.Exception as Exception
 import React.Halo as Halo
 import Record as Record
+import Type.Proxy (Proxy(..))
 
 type Env =
   { auth :: AuthIO
   , routing :: RoutingIO
   }
 
-newtype AppM a
-  = AppM (ReaderT Env Aff a)
+newtype AppM a = AppM (ReaderT Env Aff a)
 
 runAppM :: Env -> AppM ~> Aff
 runAppM env (AppM m) = runReaderT m env
@@ -103,17 +102,17 @@ instance UserRepository AppM where
   loginUser credentials = do
     (res :: Either Error { user :: CurrentUser }) <- makeRequest POST (StatusCode 200) Endpoint.Login loginBodyCodec userResponseCodec { user: credentials }
     for_ res \{ user: currentUser } -> do
-      Auth.modify $ const $ toAuth currentUser.token (Just $ Record.delete (SProxy :: _ "token") currentUser)
+      Auth.modify $ const $ toAuth currentUser.token (Just $ Record.delete (Proxy :: _ "token") currentUser)
     pure $ res <#> _.user
   registerUser user = do
     (res :: Either Error { user :: CurrentUser }) <- makeRequest POST (StatusCode 200) Endpoint.Users registerBodyCodec userResponseCodec { user }
     for_ res \{ user: currentUser } -> do
-      Auth.modify $ const $ toAuth currentUser.token (Just $ Record.delete (SProxy :: _ "token") currentUser)
+      Auth.modify $ const $ toAuth currentUser.token (Just $ Record.delete (Proxy :: _ "token") currentUser)
     pure $ res <#> _.user
   updateUser user = do
     (res :: Either Error { user :: CurrentUser }) <- makeSecureRequest PUT (StatusCode 200) Endpoint.User updateUserBodyCodec userResponseCodec { user }
     for_ res \{ user: currentUser } -> do
-      Auth.modify $ map $ _ { user = Just $ Record.delete (SProxy :: _ "token") currentUser }
+      Auth.modify $ map $ _ { user = Just $ Record.delete (Proxy :: _ "token") currentUser }
     pure $ res <#> _.user
   logoutUser = do
     void $ Auth.modify $ const Nothing

src/Conduit/Assets.js

@@ -1 +1 @@
-exports.smileyCyrus = require("../../assets/smiley-cyrus.jpg");
+export { default as smileyCyrus } from "../../assets/smiley-cyrus.jpg";

src/Conduit/Capability/Auth.purs

@@ -15,12 +15,12 @@ class
   getEmitter :: m (HS.Emitter (Maybe Auth))
   modify :: (Maybe Auth -> Maybe Auth) -> m (Maybe Auth)
 
-instance MonadAuth m => MonadAuth (HaloM props ctx state action m) where
+instance MonadAuth m => MonadAuth (HaloM props state action m) where
   read = lift read
   getEmitter = lift getEmitter
   modify = lift <<< modify
 
-subscribe :: forall m props ctx state action. MonadAuth m => (Maybe Auth -> action) -> HaloM props ctx state action m Unit
+subscribe :: forall m props state action. MonadAuth m => (Maybe Auth -> action) -> HaloM props state action m Unit
 subscribe f = do
   emitter <- lift getEmitter
   void $ Halo.subscribe $ f <$> emitter

src/Conduit/Capability/Halo.purs

@@ -10,4 +10,4 @@ import React.Halo (ComponentSpec)
 class
   Monad m <=
   MonadHalo m where
-  component :: forall hooks props ctx state action. String -> ComponentSpec hooks props ctx state action m -> m (props -> JSX)
+  component :: forall props state action. String -> ComponentSpec props state action m -> m (props -> JSX)

src/Conduit/Capability/Resource/Article.purs

@@ -19,7 +19,7 @@ class
   deleteArticle :: Slug -> m (Either Error Unit)
   toggleFavorite :: Article -> m (Either Error Article)
 
-instance ArticleRepository m => ArticleRepository (HaloM props ctx state action m) where
+instance ArticleRepository m => ArticleRepository (HaloM props state action m) where
   listArticles = lift <<< listArticles
   listFeed = lift <<< listFeed
   getArticle = lift <<< getArticle

src/Conduit/Capability/Resource/Comment.purs

@@ -15,7 +15,7 @@ class
   createComment :: Slug -> { body :: String } -> m (Either Error Comment)
   deleteComment :: Slug -> CommentId -> m (Either Error Unit)
 
-instance CommentRepository m => CommentRepository (HaloM props ctx state action m) where
+instance CommentRepository m => CommentRepository (HaloM props state action m) where
   listComments = lift <<< listComments
   createComment = \a b -> lift $ createComment a b
   deleteComment = \a b -> lift $ deleteComment a b

src/Conduit/Capability/Resource/Profile.purs

@@ -14,6 +14,6 @@ class
   getProfile :: Username -> m (Either Error Profile)
   toggleFollow :: Profile -> m (Either Error Profile)
 
-instance ProfileRepository m => ProfileRepository (HaloM props ctx state action m) where
+instance ProfileRepository m => ProfileRepository (HaloM props state action m) where
   getProfile = lift <<< getProfile
   toggleFollow = lift <<< toggleFollow

src/Conduit/Capability/Resource/Tag.purs

@@ -11,5 +11,5 @@ class
   TagRepository m where
   listTags :: m (Either Error (Array String))
 
-instance TagRepository m => TagRepository (HaloM props ctx state action m) where
+instance TagRepository m => TagRepository (HaloM props state action m) where
   listTags = lift listTags

src/Conduit/Capability/Resource/User.purs

@@ -16,7 +16,7 @@ class
   updateUser :: { | UserRep (password :: String) } -> m (Either Error CurrentUser)
   logoutUser :: m Unit
 
-instance UserRepository m => UserRepository (HaloM props ctx state action m) where
+instance UserRepository m => UserRepository (HaloM props state action m) where
   loginUser = lift <<< loginUser
   registerUser = lift <<< registerUser
   updateUser = lift <<< updateUser

src/Conduit/Capability/Routing.purs

@@ -15,13 +15,13 @@ class
   navigate :: Route -> m Unit
   redirect :: Route -> m Unit
 
-instance MonadRouting m => MonadRouting (HaloM props ctx state action m) where
+instance MonadRouting m => MonadRouting (HaloM props state action m) where
   read = lift read
   getEmitter = lift getEmitter
   navigate = lift <<< navigate
   redirect = lift <<< redirect
 
-subscribe :: forall m props ctx state action. MonadRouting m => (Route -> action) -> HaloM props ctx state action m Unit
+subscribe :: forall m props state action. MonadRouting m => (Route -> action) -> HaloM props state action m Unit
 subscribe f = do
   emitter <- lift getEmitter
   void $ Halo.subscribe $ f <$> emitter

src/Conduit/Component/Auth.purs

@@ -12,7 +12,6 @@ import Data.Either (Either, hush)
 import Data.Foldable (for_, traverse_)
 import Data.HTTP.Method (Method(..))
 import Data.Maybe (Maybe(..))
-import Data.Symbol (SProxy(..))
 import Data.Tuple.Nested (type (/\), (/\))
 import Effect (Effect)
 import Effect.Aff (launchAff_)
@@ -23,6 +22,7 @@ import Foreign.Day (now)
 import Halogen.Subscription as HS
 import React.Basic.Hooks as React
 import Record as Record
+import Type.Proxy (Proxy(..))
 import Web.HTML (window)
 import Web.HTML.Window as Window
 import Web.Storage.Storage as Storage
@@ -92,4 +92,4 @@ mkAuthManager = do
           (res :: Either Error { user :: CurrentUser }) <- makeSecureRequest' token GET (StatusCode 200) Endpoint.User CA.null (CAR.object "UserResponse" { user: currentUserCodec }) unit
           liftEffect case hush $ _.user <$> res of
             Nothing -> void $ modify $ const Nothing
-            Just user -> void $ modify $ const $ toAuth user.token (Just $ Record.delete (SProxy :: SProxy "token") user)
+            Just user -> void $ modify $ const $ toAuth user.token (Just $ Record.delete (Proxy :: Proxy "token") user)

src/Conduit/Component/Routing.purs

@@ -11,7 +11,7 @@ import React.Basic.Hooks as React
 import Routing.Duplex (parse, print)
 import Routing.PushState as PushState
 import Web.Router as Router
-import Web.Router.Driver.PushState as Driver
+import Web.Router.PushState as Driver
 
 type RoutingIO =
   { read :: Effect Route
@@ -27,9 +27,9 @@ mkRoutingManager = do
   value <- Ref.new $ either (const Error) identity $ parse routeCodec path
   { emitter, listener } <- HS.create
   let
-    driver = Driver.makeDriver_ (parse routeCodec) (print routeCodec) interface
+    driver = Driver.mkInterface_ (parse routeCodec) (print routeCodec) interface
   router <-
-    Router.makeRouter
+    Router.mkInterface
       (\_ _ -> Router.continue)
       ( case _ of
           Router.Resolved _ route -> do

src/Conduit/Config.js

@@ -1,3 +1,3 @@
-exports.apiEndpoint = process.env.API_ENDPOINT || "";
+export const apiEndpoint = process.env.API_ENDPOINT || "";
 
-exports.nodeEnv = process.env.NODE_ENV || "";
+export const nodeEnv = process.env.NODE_ENV || "";

src/Conduit/Data/Avatar.purs

@@ -8,8 +8,7 @@ import Data.Codec.Argonaut as CA
 import Data.Maybe (Maybe(..))
 import Data.String as String
 
-newtype Avatar
-  = Avatar String
+newtype Avatar = Avatar String
 
 derive instance Eq Avatar
 

src/Conduit/Data/Comment.purs

@@ -18,8 +18,7 @@ type Comment =
   , author :: Profile
   }
 
-newtype CommentId
-  = CommentId Int
+newtype CommentId = CommentId Int
 
 derive instance Newtype CommentId _
 

src/Conduit/Data/Slug.purs

@@ -10,8 +10,7 @@ import Data.String.Regex as Regex
 import Data.String.Regex.Flags as Flags
 import Partial.Unsafe (unsafePartial)
 
-newtype Slug
-  = Slug String
+newtype Slug = Slug String
 
 derive instance Eq Slug
 

src/Conduit/Data/Username.purs

@@ -6,8 +6,7 @@ import Data.Codec.Argonaut (JsonCodec)
 import Data.Codec.Argonaut as CA
 import Data.Maybe (Maybe(..))
 
-newtype Username
-  = Username String
+newtype Username = Username String
 
 derive instance Eq Username
 

src/Conduit/Form/Validated.purs

@@ -51,8 +51,7 @@ _Modified =
     _ -> Nothing
 
 -- | Mapping instance
-newtype ModifyValidated
-  = ModifyValidated (Validated ~> Validated)
+newtype ModifyValidated = ModifyValidated (Validated ~> Validated)
 
 instance Mapping ModifyValidated a a => Mapping ModifyValidated (Validated a) (Validated a) where
   mapping m@(ModifyValidated f) = over _Validated (mapping m) <<< f

src/Conduit/Page/Article.purs

@@ -31,7 +31,6 @@ import Data.Lens (preview, set)
 import Data.Lens.Record as LR
 import Data.Maybe (Maybe(..), maybe)
 import Data.Monoid (guard)
-import Data.Symbol (SProxy(..))
 import Data.Validation.Semigroup (V, toEither)
 import Foreign.Day (toDisplay)
 import Foreign.NanoMarkdown (nmd)
@@ -42,6 +41,7 @@ import React.Basic.DOM.Events (preventDefault, targetValue)
 import React.Basic.Events (handler, handler_)
 import React.Basic.Hooks as React
 import React.Halo as Halo
+import Type.Proxy (Proxy(..))
 
 type Props =
   { slug :: Slug
@@ -70,11 +70,9 @@ mkArticlePage ::
   ProfileRepository m =>
   MonadHalo m =>
   m (Props -> React.JSX)
-mkArticlePage = component "ArticlePage" { context, initialState, eval, render }
+mkArticlePage = component "ArticlePage" { initialState, eval, render }
   where
-  context _ = pure unit
-
-  initialState _ _ =
+  initialState _ =
     { auth: Nothing
     , article: RemoteData.NotAsked
     , comments: RemoteData.NotAsked
@@ -84,9 +82,9 @@ mkArticlePage = component "ArticlePage" { context, initialState, eval, render }
 
   eval =
     Halo.mkEval
-      _
+      Halo.defaultEval
         { onInitialize = \_ -> Just Initialize
-        , onUpdate = \prev next -> Just $ OnPropsUpdate prev.props next.props
+        , onUpdate = \prev next -> Just $ OnPropsUpdate prev next
         , onAction = handleAction
         }
 
@@ -158,7 +156,7 @@ mkArticlePage = component "ArticlePage" { context, initialState, eval, render }
 
   validate :: forall r. { body :: Validated String | r } -> V { body :: Array String } { body :: String }
   validate values = ado
-    body <- values.body # V.validated (LR.prop (SProxy :: _ "body")) F.nonEmpty
+    body <- values.body # V.validated (LR.prop (Proxy :: _ "body")) F.nonEmpty
     in { body }
 
   render { state, send } =