From d38f9e36b2e2e74799167e7992707516836b8160 Mon Sep 17 00:00:00 2001 From: dmjio Date: Sun, 9 Feb 2025 16:46:46 -0600 Subject: [PATCH 1/3] Hide `show` re-exports on text > 2.1.2 in Miso.String --- text-src/Miso/String.hs | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/text-src/Miso/String.hs b/text-src/Miso/String.hs index 397921a80..0d44cf64d 100644 --- a/text-src/Miso/String.hs +++ b/text-src/Miso/String.hs @@ -16,17 +16,20 @@ module Miso.String , 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 From c7958af72c299d6754c801a4da0dcf93f1741f58 Mon Sep 17 00:00:00 2001 From: dmjio Date: Sun, 9 Feb 2025 16:51:38 -0600 Subject: [PATCH 2/3] Revert "Fix build with `text` 2.1.2 (#752)" This reverts commit 9d15de0001b7afb98e0983e7bc09ca81faa681fd. --- src/Miso/FFI.hs | 2 +- src/Miso/Html/Types.hs | 2 +- src/Miso/Subscription/History.hs | 2 +- text-src/Miso/String.hs | 8 ++++---- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/Miso/FFI.hs b/src/Miso/FFI.hs index 49dd2b313..211d136b3 100644 --- a/src/Miso/FFI.hs +++ b/src/Miso/FFI.hs @@ -64,7 +64,7 @@ import Language.Javascript.JSaddle hiding (obj, val) #else import Language.Javascript.JSaddle hiding (Success, obj, val) #endif -import Miso.String hiding (show) +import Miso.String -- | Run given `JSM` action asynchronously, in a separate thread. forkJSM :: JSM () -> JSM () diff --git a/src/Miso/Html/Types.hs b/src/Miso/Html/Types.hs index 8a11f1581..2d15c848b 100644 --- a/src/Miso/Html/Types.hs +++ b/src/Miso/Html/Types.hs @@ -65,7 +65,7 @@ import Text.HTML.TagSoup (Tag(..)) import Miso.Effect import Miso.Event import Miso.FFI -import Miso.String hiding (reverse, elem, show ) +import Miso.String hiding (reverse, elem) -- | Core type for constructing a `VTree`, use this instead of `VTree` directly. data View action diff --git a/src/Miso/Subscription/History.hs b/src/Miso/Subscription/History.hs index ba6d381de..26b420505 100644 --- a/src/Miso/Subscription/History.hs +++ b/src/Miso/Subscription/History.hs @@ -29,7 +29,7 @@ import Miso.Concurrent import Miso.Effect (Sub) import Miso.FFI import qualified Miso.FFI.History as FFI -import Miso.String hiding (show) +import Miso.String import Network.URI hiding (path) import System.IO.Unsafe diff --git a/text-src/Miso/String.hs b/text-src/Miso/String.hs index 0d44cf64d..65ddecb3c 100644 --- a/text-src/Miso/String.hs +++ b/text-src/Miso/String.hs @@ -73,13 +73,13 @@ instance ToMisoString B.ByteString where instance ToMisoString BL.ByteString where toMisoString = toMisoString . LT.decodeUtf8 instance ToMisoString Float where - toMisoString = T.pack . Prelude.show + toMisoString = T.pack . show instance ToMisoString Double where - toMisoString = T.pack . Prelude.show + toMisoString = T.pack . show instance ToMisoString Int where - toMisoString = T.pack . Prelude.show + toMisoString = T.pack . show instance ToMisoString Word where - toMisoString = T.pack . Prelude.show + toMisoString = T.pack . show instance FromMisoString MisoString where fromMisoStringEither = Right From 4b62d736f581e720578fdaf2b35f47f6d63f3c78 Mon Sep 17 00:00:00 2001 From: dmjio Date: Sun, 9 Feb 2025 16:53:14 -0600 Subject: [PATCH 3/3] Use explicit Prelude --- text-src/Miso/String.hs | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/text-src/Miso/String.hs b/text-src/Miso/String.hs index 65ddecb3c..f2e2d8526 100644 --- a/text-src/Miso/String.hs +++ b/text-src/Miso/String.hs @@ -35,7 +35,7 @@ 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 @@ -73,13 +73,13 @@ instance ToMisoString B.ByteString where 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