diff --git a/README.md b/README.md --- a/README.md +++ b/README.md @@ -4,7 +4,7 @@ -

A tasty Haskell front-end framework

+

A tasty Haskell front-end web framework

@@ -38,6 +38,7 @@ - [Begin](#begin) - [Nix](#nix) - [Architecture](#architecture) + - [Under the hood](#under-the-hood) - [Examples](#examples) - [TodoMVC](#todomvc) - [Flatris](#flatris) @@ -177,6 +178,10 @@ ### Architecture For constructing client and server applications, we recommend using one `cabal` file with two executable sections, where the `buildable` attribute set is contingent on the compiler. An example of this layout is [here](https://github.com/dmjio/miso/blob/master/examples/haskell-miso.org/haskell-miso.cabal#L16-L60). For more info on how to use `stack` with a `client`/`server` setup, see this [link](https://docs.haskellstack.org/en/stable/ghcjs/#project-with-both-client-and-server). For more information on how to use `nix` with a `client`/`server` setup, see the [nix scripts](https://github.com/dmjio/miso/blob/master/examples/haskell-miso.org/default.nix) for [https://haskell-miso.org](https://haskell-miso.org). + +## Under the hood + +For details of the internals and general overview of how `miso` works, see the [Internals](docs/Internals.md). ## Examples diff --git a/jsstring-src/Miso/String.hs b/jsstring-src/Miso/String.hs --- a/jsstring-src/Miso/String.hs +++ b/jsstring-src/Miso/String.hs @@ -8,9 +8,9 @@ ----------------------------------------------------------------------------- -- | -- Module : Miso.String --- Copyright : (C) 2016-2018 David M. Johnson +-- Copyright : (C) 2016-2025 David M. Johnson -- License : BSD3-style (see the file LICENSE) --- Maintainer : David M. Johnson +-- Maintainer : David M. Johnson -- Stability : experimental -- Portability : non-portable ---------------------------------------------------------------------------- diff --git a/miso.cabal b/miso.cabal --- a/miso.cabal +++ b/miso.cabal @@ -1,17 +1,17 @@ +cabal-version: 2.2 name: miso -version: 1.8.5.0 +version: 1.8.6.0 category: Web, Miso, Data Structures -license: BSD3 +license: BSD-3-Clause license-file: LICENSE -author: David M. Johnson -maintainer: David M. Johnson +author: David M. Johnson +maintainer: David M. Johnson homepage: http://github.com/dmjio/miso -copyright: Copyright (c) 2017-2020 David M. Johnson +copyright: Copyright (c) 2016-2025 David M. Johnson bug-reports: https://github.com/dmjio/miso/issues build-type: Simple extra-source-files: README.md -cabal-version: 1.22 -synopsis: A tasty Haskell front-end framework +synopsis: A tasty Haskell front-end web framework description: Miso is a small, production-ready, "isomorphic" Haskell front-end framework featuring a virtual-dom, recursive diffing / patching algorithm, event delegation, event batching, SVG, Server-sent events, Websockets, type-safe servant-style routing and an extensible Subscription-based subsystem. Inspired by Elm, Redux and Bobril. Miso is pure by default, but side effects (like XHR) can be introduced into the system via the Effect data type. Miso makes heavy use of the GHCJS FFI and therefore has minimal dependencies. @@ -46,6 +46,8 @@ Always set MisoString = JSString executable tests + default-language: + Haskell2010 main-is: Main.hs if !(impl(ghcjs) || arch(javascript)) || !flag(tests) @@ -75,8 +77,6 @@ unordered-containers, transformers, vector - default-language: - Haskell2010 library default-language: diff --git a/src/Miso.hs b/src/Miso.hs --- a/src/Miso.hs +++ b/src/Miso.hs @@ -13,9 +13,9 @@ ----------------------------------------------------------------------------- -- | -- Module : Miso --- Copyright : (C) 2016-2018 David M. Johnson +-- Copyright : (C) 2016-2025 David M. Johnson -- License : BSD3-style (see the file LICENSE) --- Maintainer : David M. Johnson +-- Maintainer : David M. Johnson -- Stability : experimental -- Portability : non-portable ---------------------------------------------------------------------------- @@ -180,11 +180,11 @@ :: Sink action -> (action -> model -> Effect action model) -> Acc model -> action -> Acc model -foldEffects sink update = \(Acc model as) action -> +foldEffects snk update = \(Acc model as) action -> case update action model of Effect newModel effs -> Acc newModel newAs where newAs = as >> do - forM_ effs $ \eff -> forkJSM (eff sink) + forM_ effs $ \eff -> forkJSM (eff snk) data Acc model = Acc !model !(JSM ()) diff --git a/src/Miso/Concurrent.hs b/src/Miso/Concurrent.hs --- a/src/Miso/Concurrent.hs +++ b/src/Miso/Concurrent.hs @@ -2,9 +2,9 @@ ----------------------------------------------------------------------------- -- | -- Module : Miso.Concurrent --- Copyright : (C) 2016-2018 David M. Johnson +-- Copyright : (C) 2016-2025 David M. Johnson -- License : BSD3-style (see the file LICENSE) --- Maintainer : David M. Johnson +-- Maintainer : David M. Johnson -- Stability : experimental -- Portability : non-portable ---------------------------------------------------------------------------- diff --git a/src/Miso/Delegate.hs b/src/Miso/Delegate.hs --- a/src/Miso/Delegate.hs +++ b/src/Miso/Delegate.hs @@ -1,9 +1,9 @@ ----------------------------------------------------------------------------- -- | -- Module : Miso.Delegate --- Copyright : (C) 2016-2018 David M. Johnson +-- Copyright : (C) 2016-2025 David M. Johnson -- License : BSD3-style (see the file LICENSE) --- Maintainer : David M. Johnson +-- Maintainer : David M. Johnson -- Stability : experimental -- Portability : non-portable ---------------------------------------------------------------------------- diff --git a/src/Miso/Dev.hs b/src/Miso/Dev.hs --- a/src/Miso/Dev.hs +++ b/src/Miso/Dev.hs @@ -1,9 +1,9 @@ ----------------------------------------------------------------------------- -- | -- Module : Miso.Dev --- Copyright : (C) 2016-2018 David M. Johnson +-- Copyright : (C) 2016-2025 David M. Johnson -- License : BSD3-style (see the file LICENSE) --- Maintainer : David M. Johnson +-- Maintainer : David M. Johnson -- Stability : experimental -- Portability : non-portable ---------------------------------------------------------------------------- diff --git a/src/Miso/Diff.hs b/src/Miso/Diff.hs --- a/src/Miso/Diff.hs +++ b/src/Miso/Diff.hs @@ -1,9 +1,9 @@ ----------------------------------------------------------------------------- -- | -- Module : Miso.Diff --- Copyright : (C) 2016-2018 David M. Johnson +-- Copyright : (C) 2016-2025 David M. Johnson -- License : BSD3-style (see the file LICENSE) --- Maintainer : David M. Johnson +-- Maintainer : David M. Johnson -- Stability : experimental -- Portability : non-portable ---------------------------------------------------------------------------- diff --git a/src/Miso/Effect.hs b/src/Miso/Effect.hs --- a/src/Miso/Effect.hs +++ b/src/Miso/Effect.hs @@ -1,9 +1,9 @@ ----------------------------------------------------------------------------- -- | -- Module : Miso.Effect --- Copyright : (C) 2016-2018 David M. Johnson +-- Copyright : (C) 2016-2025 David M. Johnson -- License : BSD3-style (see the file LICENSE) --- Maintainer : David M. Johnson +-- Maintainer : David M. Johnson -- Stability : experimental -- Portability : non-portable -- diff --git a/src/Miso/Effect/DOM.hs b/src/Miso/Effect/DOM.hs --- a/src/Miso/Effect/DOM.hs +++ b/src/Miso/Effect/DOM.hs @@ -1,9 +1,9 @@ ----------------------------------------------------------------------------- -- | -- Module : Miso.Effect.DOM --- Copyright : (C) 2016-2018 David M. Johnson +-- Copyright : (C) 2016-2025 David M. Johnson -- License : BSD3-style (see the file LICENSE) --- Maintainer : David M. Johnson +-- Maintainer : David M. Johnson -- Stability : experimental -- Portability : non-portable ---------------------------------------------------------------------------- diff --git a/src/Miso/Effect/Storage.hs b/src/Miso/Effect/Storage.hs --- a/src/Miso/Effect/Storage.hs +++ b/src/Miso/Effect/Storage.hs @@ -5,9 +5,9 @@ ----------------------------------------------------------------------------- -- | -- Module : Miso.Effect.Storage --- Copyright : (C) 2016-2018 David M. Johnson +-- Copyright : (C) 2016-2025 David M. Johnson -- License : BSD3-style (see the file LICENSE) --- Maintainer : David M. Johnson +-- Maintainer : David M. Johnson -- Stability : experimental -- Portability : non-portable -- diff --git a/src/Miso/Event.hs b/src/Miso/Event.hs --- a/src/Miso/Event.hs +++ b/src/Miso/Event.hs @@ -1,9 +1,9 @@ ----------------------------------------------------------------------------- -- | -- Module : Miso.Event --- Copyright : (C) 2016-2018 David M. Johnson +-- Copyright : (C) 2016-2025 David M. Johnson -- License : BSD3-style (see the file LICENSE) --- Maintainer : David M. Johnson +-- Maintainer : David M. Johnson -- Stability : experimental -- Portability : non-portable ---------------------------------------------------------------------------- diff --git a/src/Miso/Event/Decoder.hs b/src/Miso/Event/Decoder.hs --- a/src/Miso/Event/Decoder.hs +++ b/src/Miso/Event/Decoder.hs @@ -3,9 +3,9 @@ ----------------------------------------------------------------------------- -- | -- Module : Miso.Event.Decoder --- Copyright : (C) 2016-2018 David M. Johnson +-- Copyright : (C) 2016-2025 David M. Johnson -- License : BSD3-style (see the file LICENSE) --- Maintainer : David M. Johnson +-- Maintainer : David M. Johnson -- Stability : experimental -- Portability : non-portable ---------------------------------------------------------------------------- diff --git a/src/Miso/Event/Types.hs b/src/Miso/Event/Types.hs --- a/src/Miso/Event/Types.hs +++ b/src/Miso/Event/Types.hs @@ -4,9 +4,9 @@ ----------------------------------------------------------------------------- -- | -- Module : Miso.Event.Types --- Copyright : (C) 2016-2018 David M. Johnson +-- Copyright : (C) 2016-2025 David M. Johnson -- License : BSD3-style (see the file LICENSE) --- Maintainer : David M. Johnson +-- Maintainer : David M. Johnson -- Stability : experimental -- Portability : non-portable ---------------------------------------------------------------------------- diff --git a/src/Miso/FFI.hs b/src/Miso/FFI.hs --- a/src/Miso/FFI.hs +++ b/src/Miso/FFI.hs @@ -5,9 +5,9 @@ ----------------------------------------------------------------------------- -- | -- Module : Miso.FFI --- Copyright : (C) 2016-2018 David M. Johnson +-- Copyright : (C) 2016-2025 David M. Johnson -- License : BSD3-style (see the file LICENSE) --- Maintainer : David M. Johnson +-- Maintainer : David M. Johnson -- Stability : experimental -- Portability : non-portable ---------------------------------------------------------------------------- diff --git a/src/Miso/FFI/History.hs b/src/Miso/FFI/History.hs --- a/src/Miso/FFI/History.hs +++ b/src/Miso/FFI/History.hs @@ -1,9 +1,9 @@ ----------------------------------------------------------------------------- -- | -- Module : Miso.FFI.History --- Copyright : (C) 2016-2018 David M. Johnson +-- Copyright : (C) 2016-2025 David M. Johnson -- License : BSD3-style (see the file LICENSE) --- Maintainer : David M. Johnson +-- Maintainer : David M. Johnson -- Stability : experimental -- Portability : non-portable ---------------------------------------------------------------------------- diff --git a/src/Miso/FFI/SSE.hs b/src/Miso/FFI/SSE.hs --- a/src/Miso/FFI/SSE.hs +++ b/src/Miso/FFI/SSE.hs @@ -5,9 +5,9 @@ ----------------------------------------------------------------------------- -- | -- Module : Miso.FFI.SSE --- Copyright : (C) 2016-2018 David M. Johnson +-- Copyright : (C) 2016-2025 David M. Johnson -- License : BSD3-style (see the file LICENSE) --- Maintainer : David M. Johnson +-- Maintainer : David M. Johnson -- Stability : experimental -- Portability : non-portable ---------------------------------------------------------------------------- diff --git a/src/Miso/FFI/Storage.hs b/src/Miso/FFI/Storage.hs --- a/src/Miso/FFI/Storage.hs +++ b/src/Miso/FFI/Storage.hs @@ -1,9 +1,9 @@ ----------------------------------------------------------------------------- -- | -- Module : Miso.FFI.Storage --- Copyright : (C) 2016-2018 David M. Johnson +-- Copyright : (C) 2016-2025 David M. Johnson -- License : BSD3-style (see the file LICENSE) --- Maintainer : David M. Johnson +-- Maintainer : David M. Johnson -- Stability : experimental -- Portability : non-portable ---------------------------------------------------------------------------- diff --git a/src/Miso/FFI/WebSocket.hs b/src/Miso/FFI/WebSocket.hs --- a/src/Miso/FFI/WebSocket.hs +++ b/src/Miso/FFI/WebSocket.hs @@ -5,9 +5,9 @@ ----------------------------------------------------------------------------- -- | -- Module : Miso.FFI.WebSocket --- Copyright : (C) 2016-2018 David M. Johnson +-- Copyright : (C) 2016-2025 David M. Johnson -- License : BSD3-style (see the file LICENSE) --- Maintainer : David M. Johnson +-- Maintainer : David M. Johnson -- Stability : experimental -- Portability : non-portable ---------------------------------------------------------------------------- diff --git a/src/Miso/Html.hs b/src/Miso/Html.hs --- a/src/Miso/Html.hs +++ b/src/Miso/Html.hs @@ -1,9 +1,9 @@ ----------------------------------------------------------------------------- -- | -- Module : Miso.Html --- Copyright : (C) 2016-2018 David M. Johnson +-- Copyright : (C) 2016-2025 David M. Johnson -- License : BSD3-style (see the file LICENSE) --- Maintainer : David M. Johnson +-- Maintainer : David M. Johnson -- Stability : experimental -- Portability : non-portable -- diff --git a/src/Miso/Html/Element.hs b/src/Miso/Html/Element.hs --- a/src/Miso/Html/Element.hs +++ b/src/Miso/Html/Element.hs @@ -2,9 +2,9 @@ ----------------------------------------------------------------------------- -- | -- Module : Miso.Html.Element --- Copyright : (C) 2016-2018 David M. Johnson +-- Copyright : (C) 2016-2025 David M. Johnson -- License : BSD3-style (see the file LICENSE) --- Maintainer : David M. Johnson +-- Maintainer : David M. Johnson -- Stability : experimental -- Portability : non-portable ---------------------------------------------------------------------------- diff --git a/src/Miso/Html/Event.hs b/src/Miso/Html/Event.hs --- a/src/Miso/Html/Event.hs +++ b/src/Miso/Html/Event.hs @@ -11,9 +11,9 @@ ----------------------------------------------------------------------------- -- | -- Module : Miso.Html.Event --- Copyright : (C) 2016-2018 David M. Johnson +-- Copyright : (C) 2016-2025 David M. Johnson -- License : BSD3-style (see the file LICENSE) --- Maintainer : David M. Johnson +-- Maintainer : David M. Johnson -- Stability : experimental -- Portability : non-portable -- diff --git a/src/Miso/Html/Property.hs b/src/Miso/Html/Property.hs --- a/src/Miso/Html/Property.hs +++ b/src/Miso/Html/Property.hs @@ -3,9 +3,9 @@ ----------------------------------------------------------------------------- -- | -- Module : Miso.Html.Property --- Copyright : (C) 2016-2018 David M. Johnson +-- Copyright : (C) 2016-2025 David M. Johnson -- License : BSD3-style (see the file LICENSE) --- Maintainer : David M. Johnson +-- Maintainer : David M. Johnson -- Stability : experimental -- Portability : non-portable -- diff --git a/src/Miso/Mathml.hs b/src/Miso/Mathml.hs --- a/src/Miso/Mathml.hs +++ b/src/Miso/Mathml.hs @@ -1,9 +1,9 @@ ----------------------------------------------------------------------------- -- | -- Module : Miso.Mathml --- Copyright : (C) 2016-2018 David M. Johnson +-- Copyright : (C) 2016-2025 David M. Johnson -- License : BSD3-style (see the file LICENSE) --- Maintainer : David M. Johnson +-- Maintainer : David M. Johnson -- Stability : experimental -- Portability : non-portable -- diff --git a/src/Miso/Mathml/Element.hs b/src/Miso/Mathml/Element.hs --- a/src/Miso/Mathml/Element.hs +++ b/src/Miso/Mathml/Element.hs @@ -3,9 +3,9 @@ ----------------------------------------------------------------------------- -- | -- Module : Miso.Mathml.Element --- Copyright : (C) 2016-2018 David M. Johnson +-- Copyright : (C) 2016-2025 David M. Johnson -- License : BSD3-style (see the file LICENSE) --- Maintainer : David M. Johnson +-- Maintainer : David M. Johnson -- Stability : experimental -- Portability : non-portable ---------------------------------------------------------------------------- diff --git a/src/Miso/Router.hs b/src/Miso/Router.hs --- a/src/Miso/Router.hs +++ b/src/Miso/Router.hs @@ -16,9 +16,9 @@ ----------------------------------------------------------------------------- -- | -- Module : Miso.Router --- Copyright : (C) 2016-2018 David M. Johnson +-- Copyright : (C) 2016-2025 David M. Johnson -- License : BSD3-style (see the file LICENSE) --- Maintainer : David M. Johnson +-- Maintainer : David M. Johnson -- Stability : experimental -- Portability : non-portable ---------------------------------------------------------------------------- diff --git a/src/Miso/Subscription.hs b/src/Miso/Subscription.hs --- a/src/Miso/Subscription.hs +++ b/src/Miso/Subscription.hs @@ -1,9 +1,9 @@ ----------------------------------------------------------------------------- -- | -- Module : Miso.Subscription --- Copyright : (C) 2016-2018 David M. Johnson +-- Copyright : (C) 2016-2025 David M. Johnson -- License : BSD3-style (see the file LICENSE) --- Maintainer : David M. Johnson +-- Maintainer : David M. Johnson -- Stability : experimental -- Portability : non-portable ---------------------------------------------------------------------------- diff --git a/src/Miso/Subscription/History.hs b/src/Miso/Subscription/History.hs --- a/src/Miso/Subscription/History.hs +++ b/src/Miso/Subscription/History.hs @@ -6,9 +6,9 @@ ----------------------------------------------------------------------------- -- | -- Module : Miso.Subscription.History --- Copyright : (C) 2016-2018 David M. Johnson +-- Copyright : (C) 2016-2025 David M. Johnson -- License : BSD3-style (see the file LICENSE) --- Maintainer : David M. Johnson +-- Maintainer : David M. Johnson -- Stability : experimental -- Portability : non-portable ---------------------------------------------------------------------------- diff --git a/src/Miso/Subscription/Keyboard.hs b/src/Miso/Subscription/Keyboard.hs --- a/src/Miso/Subscription/Keyboard.hs +++ b/src/Miso/Subscription/Keyboard.hs @@ -5,9 +5,9 @@ ----------------------------------------------------------------------------- -- | -- Module : Miso.Subscription.Keyboard --- Copyright : (C) 2016-2018 David M. Johnson +-- Copyright : (C) 2016-2025 David M. Johnson -- License : BSD3-style (see the file LICENSE) --- Maintainer : David M. Johnson +-- Maintainer : David M. Johnson -- Stability : experimental -- Portability : non-portable ---------------------------------------------------------------------------- diff --git a/src/Miso/Subscription/Mouse.hs b/src/Miso/Subscription/Mouse.hs --- a/src/Miso/Subscription/Mouse.hs +++ b/src/Miso/Subscription/Mouse.hs @@ -3,9 +3,9 @@ ----------------------------------------------------------------------------- -- | -- Module : Miso.Subscription.Mouse --- Copyright : (C) 2016-2018 David M. Johnson +-- Copyright : (C) 2016-2025 David M. Johnson -- License : BSD3-style (see the file LICENSE) --- Maintainer : David M. Johnson +-- Maintainer : David M. Johnson -- Stability : experimental -- Portability : non-portable ---------------------------------------------------------------------------- diff --git a/src/Miso/Subscription/SSE.hs b/src/Miso/Subscription/SSE.hs --- a/src/Miso/Subscription/SSE.hs +++ b/src/Miso/Subscription/SSE.hs @@ -4,9 +4,9 @@ ----------------------------------------------------------------------------- -- | -- Module : Miso.Subscription.SSE --- Copyright : (C) 2016-2018 David M. Johnson +-- Copyright : (C) 2016-2025 David M. Johnson -- License : BSD3-style (see the file LICENSE) --- Maintainer : David M. Johnson +-- Maintainer : David M. Johnson -- Stability : experimental -- Portability : non-portable ---------------------------------------------------------------------------- diff --git a/src/Miso/Subscription/WebSocket.hs b/src/Miso/Subscription/WebSocket.hs --- a/src/Miso/Subscription/WebSocket.hs +++ b/src/Miso/Subscription/WebSocket.hs @@ -8,9 +8,9 @@ ----------------------------------------------------------------------------- -- | -- Module : Miso.Subscription.WebSocket --- Copyright : (C) 2016-2018 David M. Johnson +-- Copyright : (C) 2016-2025 David M. Johnson -- License : BSD3-style (see the file LICENSE) --- Maintainer : David M. Johnson +-- Maintainer : David M. Johnson -- Stability : experimental -- Portability : non-portable ---------------------------------------------------------------------------- diff --git a/src/Miso/Subscription/Window.hs b/src/Miso/Subscription/Window.hs --- a/src/Miso/Subscription/Window.hs +++ b/src/Miso/Subscription/Window.hs @@ -3,9 +3,9 @@ ----------------------------------------------------------------------------- -- | -- Module : Miso.Subscription.Window --- Copyright : (C) 2016-2018 David M. Johnson +-- Copyright : (C) 2016-2025 David M. Johnson -- License : BSD3-style (see the file LICENSE) --- Maintainer : David M. Johnson +-- Maintainer : David M. Johnson -- Stability : experimental -- Portability : non-portable ---------------------------------------------------------------------------- diff --git a/src/Miso/Svg.hs b/src/Miso/Svg.hs --- a/src/Miso/Svg.hs +++ b/src/Miso/Svg.hs @@ -1,9 +1,9 @@ ----------------------------------------------------------------------------- -- | -- Module : Miso.Svg --- Copyright : (C) 2016-2018 David M. Johnson +-- Copyright : (C) 2016-2025 David M. Johnson -- License : BSD3-style (see the file LICENSE) --- Maintainer : David M. Johnson +-- Maintainer : David M. Johnson -- Stability : experimental -- Portability : non-portable -- diff --git a/src/Miso/Svg/Attribute.hs b/src/Miso/Svg/Attribute.hs --- a/src/Miso/Svg/Attribute.hs +++ b/src/Miso/Svg/Attribute.hs @@ -3,9 +3,9 @@ ----------------------------------------------------------------------------- -- | -- Module : Miso.Svg.Attribute --- Copyright : (C) 2016-2018 David M. Johnson +-- Copyright : (C) 2016-2025 David M. Johnson -- License : BSD3-style (see the file LICENSE) --- Maintainer : David M. Johnson +-- Maintainer : David M. Johnson -- Stability : experimental -- Portability : non-portable -- diff --git a/src/Miso/Svg/Element.hs b/src/Miso/Svg/Element.hs --- a/src/Miso/Svg/Element.hs +++ b/src/Miso/Svg/Element.hs @@ -3,9 +3,9 @@ ----------------------------------------------------------------------------- -- | -- Module : Miso.Svg.Element --- Copyright : (C) 2016-2018 David M. Johnson +-- Copyright : (C) 2016-2025 David M. Johnson -- License : BSD3-style (see the file LICENSE) --- Maintainer : David M. Johnson +-- Maintainer : David M. Johnson -- Stability : experimental -- Portability : non-portable ---------------------------------------------------------------------------- diff --git a/src/Miso/Svg/Event.hs b/src/Miso/Svg/Event.hs --- a/src/Miso/Svg/Event.hs +++ b/src/Miso/Svg/Event.hs @@ -6,9 +6,9 @@ ----------------------------------------------------------------------------- -- | -- Module : Miso.Svg.Events --- Copyright : (C) 2016-2018 David M. Johnson +-- Copyright : (C) 2016-2025 David M. Johnson -- License : BSD3-style (see the file LICENSE) --- Maintainer : David M. Johnson +-- Maintainer : David M. Johnson -- Stability : experimental -- Portability : non-portable ---------------------------------------------------------------------------- diff --git a/src/Miso/Types.hs b/src/Miso/Types.hs --- a/src/Miso/Types.hs +++ b/src/Miso/Types.hs @@ -1,9 +1,9 @@ ----------------------------------------------------------------------------- -- | -- Module : Miso.Types --- Copyright : (C) 2016-2018 David M. Johnson +-- Copyright : (C) 2016-2025 David M. Johnson -- License : BSD3-style (see the file LICENSE) --- Maintainer : David M. Johnson +-- Maintainer : David M. Johnson -- Stability : experimental -- Portability : non-portable ---------------------------------------------------------------------------- diff --git a/src/Miso/Util.hs b/src/Miso/Util.hs --- a/src/Miso/Util.hs +++ b/src/Miso/Util.hs @@ -1,9 +1,9 @@ ----------------------------------------------------------------------------- -- | -- Module : Miso.Util --- Copyright : (C) 2016-2018 David M. Johnson +-- Copyright : (C) 2016-2025 David M. Johnson -- License : BSD3-style (see the file LICENSE) --- Maintainer : David M. Johnson +-- Maintainer : David M. Johnson -- Stability : experimental -- Portability : non-portable ---------------------------------------------------------------------------- diff --git a/src/Miso/WebSocket.hs b/src/Miso/WebSocket.hs --- a/src/Miso/WebSocket.hs +++ b/src/Miso/WebSocket.hs @@ -8,9 +8,9 @@ ----------------------------------------------------------------------------- -- | -- Module : Miso.WebSocket --- Copyright : (C) 2016-2018 David M. Johnson +-- Copyright : (C) 2016-2025 David M. Johnson -- License : BSD3-style (see the file LICENSE) --- Maintainer : David M. Johnson +-- Maintainer : David M. Johnson -- Stability : experimental -- Portability : non-portable ---------------------------------------------------------------------------- diff --git a/text-src/Miso/String.hs b/text-src/Miso/String.hs --- a/text-src/Miso/String.hs +++ b/text-src/Miso/String.hs @@ -5,9 +5,9 @@ ----------------------------------------------------------------------------- -- | -- Module : Miso.String --- Copyright : (C) 2016-2018 David M. Johnson +-- Copyright : (C) 2016-2025 David M. Johnson -- License : BSD3-style (see the file LICENSE) --- Maintainer : David M. Johnson +-- Maintainer : David M. Johnson -- Stability : experimental -- Portability : non-portable ---------------------------------------------------------------------------- @@ -16,23 +16,26 @@ , FromMisoString (..) , fromMisoString , MisoString - , module Data.Monoid - , module Data.Text + , module S , ms ) where import qualified Data.ByteString as B import qualified Data.ByteString.Lazy as BL -import Data.Monoid +import Data.Monoid as S import Data.JSString import Data.JSString.Text -import Data.Text +#if MIN_VERSION_text(2,1,2) +import Data.Text as S hiding (show) +#else +import Data.Text as S +#endif import qualified Data.Text as T import qualified Data.Text.Encoding as T import qualified Data.Text.Lazy as LT import qualified Data.Text.Lazy.Encoding as LT import Text.Read(readEither) - +import Prelude as P -- | String type swappable based on compiler type MisoString = Text @@ -70,13 +73,13 @@ instance ToMisoString BL.ByteString where toMisoString = toMisoString . LT.decodeUtf8 instance ToMisoString Float where - toMisoString = T.pack . show + toMisoString = T.pack . P.show instance ToMisoString Double where - toMisoString = T.pack . show + toMisoString = T.pack . P.show instance ToMisoString Int where - toMisoString = T.pack . show + toMisoString = T.pack . P.show instance ToMisoString Word where - toMisoString = T.pack . show + toMisoString = T.pack . P.show instance FromMisoString MisoString where fromMisoStringEither = Right