I wonder if we are reading files the wrong way

Author: f-f

package.yaml

@@ -108,6 +108,7 @@ library:
   - safe
   - semver-range
   - stm
+  - stringsearch
   - tar
   - template-haskell
   - temporary
@@ -117,6 +118,7 @@ library:
   - turtle
   - unliftio
   - unordered-containers
+  - utf8-string
   - vector
   - versions
   - with-utf8

spago.cabal

@@ -4,7 +4,7 @@ cabal-version: 1.12
 --
 -- see: https://github.com/sol/hpack
 --
--- hash: d261f6a4edc91f161735e671dbcb8b6116d31f6a6dd95c88c1b277285484951d
+-- hash: 25f34ee90c40276d788a66523e0833707cf16645eadde749c8a953606886ab03
 
 name:           spago
 version:        0.16.0
@@ -102,6 +102,7 @@ library
     , safe
     , semver-range
     , stm
+    , stringsearch
     , tar
     , template-haskell
     , temporary
@@ -111,6 +112,7 @@ library
     , turtle
     , unliftio
     , unordered-containers
+    , utf8-string
     , vector
     , versions
     , with-utf8

src/Spago/Prelude.hs

@@ -67,7 +67,6 @@ module Spago.Prelude
   ) where
 
 
-import           Control.Monad.Catch                   (MonadMask)
 import qualified Data.Text                             as Text
 import qualified Data.Text.Prettyprint.Doc             as Pretty
 import qualified Data.Text.Prettyprint.Doc.Render.Text as PrettyText
@@ -91,7 +90,6 @@ import           Data.Foldable                         as X
 import           Data.Maybe                            as X
 import           Data.Sequence                         (Seq (..))
 import           Data.Text.Prettyprint.Doc             (Pretty)
-import           Data.Text.IO.Utf8                     (readFile, writeFile)
 import           Dhall.Optics                          (transformMOf)
 import           Lens.Family                           ((^..))
 import           RIO                                   as X hiding (FilePath, first, force, second, (^..))
@@ -106,6 +104,13 @@ import           UnliftIO.Directory                    (getModificationTime, mak
 import           UnliftIO.Process                      (callCommand)
 
 
+
+import qualified Data.ByteString as BS
+import qualified Data.ByteString.Lazy as BSL
+import qualified Data.ByteString.Search as BSS
+import qualified Data.ByteString.UTF8 as UTF8
+
+
 -- | Generic Error that we throw on program exit.
 --   We have it so that errors are displayed nicely to the user
 newtype SpagoError = SpagoError { _unError :: Text }
@@ -135,13 +140,20 @@ pathFromText = Turtle.fromText
 testfile :: MonadIO m => Text -> m Bool
 testfile = Turtle.testfile . pathFromText
 
-readTextFile :: MonadIO m => Turtle.FilePath -> m Text
-readTextFile = readFile . Turtle.encodeString
-
-
-writeTextFile :: (MonadIO m, MonadMask m) => Text -> Text -> m ()
-writeTextFile path text = writeFile (Text.unpack path) text
+-- | Unfortunately ByteString's readFile does not convert line endings on
+-- Windows, so we have to do it ourselves
+fixCRLF :: BS.ByteString -> BS.ByteString
+fixCRLF = BSL.toStrict . BSS.replace "\r\n" ("\n" :: BS.ByteString)
 
+readTextFile :: MonadIO m => Turtle.FilePath -> m Text
+readTextFile inFile' = do
+  content <- liftIO $ BS.readFile $ Turtle.encodeString inFile'
+  pure (Text.pack $ UTF8.toString $ fixCRLF content)
+
+writeTextFile :: MonadIO m => Text -> Text -> m ()
+writeTextFile inFile text = liftIO $ BS.writeFile
+  (Text.unpack inFile)
+  (UTF8.fromString $ Text.unpack text)
 
 with :: MonadIO m => Turtle.Managed a -> (a -> IO r) -> m r
 with r f = liftIO $ Turtle.with r f