diff --git a/bower.json b/bower.json index c16e9fb..fd6bdb5 100755 --- a/bower.json +++ b/bower.json @@ -18,10 +18,10 @@ ], "dependencies": { "purescript-arrays": "master", - "purescript-generics-rep": "master", "purescript-js-uri": "https://github.com/purescript-contrib/purescript-js-uri.git#main", "purescript-integers": "master", "purescript-parsing": "main", + "purescript-prelude": "master", "purescript-profunctor-lenses": "main", "purescript-unfoldable": "master", "purescript-these": "main" diff --git a/spago.dhall b/spago.dhall index ad2632c..9b9c0fd 100644 --- a/spago.dhall +++ b/spago.dhall @@ -3,11 +3,11 @@ [ "aff" , "arrays" , "assert" - , "generics-rep" , "integers" , "js-uri" , "numbers" , "parsing" + , "prelude" , "profunctor-lenses" , "quickcheck" , "these" diff --git a/src/URI/AbsoluteURI.purs b/src/URI/AbsoluteURI.purs index a95ff69..5dc1a95 100644 --- a/src/URI/AbsoluteURI.purs +++ b/src/URI/AbsoluteURI.purs @@ -18,9 +18,9 @@ import Prelude import Data.Array as Array import Data.Either (Either) import Data.Generic.Rep (class Generic) -import Data.Generic.Rep.Show (genericShow) import Data.Lens (Lens', lens) import Data.Maybe (Maybe(..)) +import Data.Show.Generic (genericShow) import Data.String as String import Text.Parsing.Parser (Parser) import Text.Parsing.Parser.Combinators (optionMaybe) diff --git a/src/URI/Authority.purs b/src/URI/Authority.purs index 83913c0..27451d0 100644 --- a/src/URI/Authority.purs +++ b/src/URI/Authority.purs @@ -16,9 +16,9 @@ import Prelude import Data.Either (Either) import Data.Generic.Rep (class Generic) -import Data.Generic.Rep.Show (genericShow) import Data.Lens (Lens', lens) import Data.Maybe (Maybe(..)) +import Data.Show.Generic (genericShow) import Text.Parsing.Parser (Parser) import Text.Parsing.Parser.Combinators (optionMaybe, try) import Text.Parsing.Parser.String (char, string) diff --git a/src/URI/Common.purs b/src/URI/Common.purs index f94ef25..253fa29 100644 --- a/src/URI/Common.purs +++ b/src/URI/Common.purs @@ -20,9 +20,9 @@ import Control.Monad.State (get) import Data.Array as Array import Data.Either (Either(..), either) import Data.Generic.Rep (class Generic) -import Data.Generic.Rep.Show (genericShow) import Data.Maybe (fromJust) import Data.Newtype (class Newtype, un) +import Data.Show.Generic (genericShow) import Data.String (joinWith) as String import Data.String.CodeUnits (singleton) as String import Data.String.NonEmpty (NonEmptyString) diff --git a/src/URI/Extra/QueryPairs.purs b/src/URI/Extra/QueryPairs.purs index 60a74f5..106e727 100644 --- a/src/URI/Extra/QueryPairs.purs +++ b/src/URI/Extra/QueryPairs.purs @@ -23,11 +23,11 @@ import Data.Array as Array import Data.Bifunctor (bimap) import Data.Either (Either) import Data.Generic.Rep (class Generic) -import Data.Generic.Rep.Show (genericShow) import Data.Maybe (Maybe(..), fromJust) +import Data.Show.Generic (genericShow) import Data.String as String -import Data.String.NonEmpty.CodeUnits (singleton) as NES import Data.String.NonEmpty (joinWith) as NES +import Data.String.NonEmpty.CodeUnits (singleton) as NES import Data.Traversable (traverse) import Data.Tuple (Tuple(..)) import JSURI (decodeURIComponent) diff --git a/src/URI/HierarchicalPart.purs b/src/URI/HierarchicalPart.purs index 2e6b2d2..e8a7412 100644 --- a/src/URI/HierarchicalPart.purs +++ b/src/URI/HierarchicalPart.purs @@ -20,9 +20,9 @@ import Prelude import Control.Alt ((<|>)) import Data.Either (Either(..), either) import Data.Generic.Rep (class Generic) -import Data.Generic.Rep.Show (genericShow) import Data.Lens (Traversal', wander) import Data.Maybe (Maybe(..), maybe) +import Data.Show.Generic (genericShow) import Text.Parsing.Parser (Parser) import URI.Authority (Authority(..), AuthorityOptions, AuthorityParseOptions, AuthorityPrintOptions, Host(..), IPv4Address, IPv6Address, Port, RegName, UserInfo, _IPv4Address, _IPv6Address, _NameAddress, _hosts, _userInfo) import URI.Authority as Authority diff --git a/src/URI/Host.purs b/src/URI/Host.purs index 9c84f84..06b11eb 100644 --- a/src/URI/Host.purs +++ b/src/URI/Host.purs @@ -14,9 +14,9 @@ import Prelude import Control.Alt ((<|>)) import Data.Generic.Rep (class Generic) -import Data.Generic.Rep.Show (genericShow) import Data.Lens (Prism', prism') import Data.Maybe (Maybe(..)) +import Data.Show.Generic (genericShow) import Text.Parsing.Parser (Parser) import Text.Parsing.Parser.Combinators (try) import URI.Host.IPv4Address (IPv4Address) diff --git a/src/URI/Path.purs b/src/URI/Path.purs index 35cef52..6ff77d1 100644 --- a/src/URI/Path.purs +++ b/src/URI/Path.purs @@ -4,7 +4,7 @@ import Prelude import Data.Array as Array import Data.Generic.Rep (class Generic) -import Data.Generic.Rep.Show (genericShow) +import Data.Show.Generic (genericShow) import Data.String as String import Text.Parsing.Parser (Parser) import Text.Parsing.Parser.String (char) diff --git a/src/URI/Path/Absolute.purs b/src/URI/Path/Absolute.purs index 09428d6..b6b3ceb 100644 --- a/src/URI/Path/Absolute.purs +++ b/src/URI/Path/Absolute.purs @@ -4,8 +4,8 @@ import Prelude import Data.Array as Array import Data.Generic.Rep (class Generic) -import Data.Generic.Rep.Show (genericShow) import Data.Maybe (Maybe(..)) +import Data.Show.Generic (genericShow) import Data.String as String import Data.Tuple (Tuple(..)) import Text.Parsing.Parser (Parser) diff --git a/src/URI/Path/NoScheme.purs b/src/URI/Path/NoScheme.purs index 362b5c8..bbdaad5 100644 --- a/src/URI/Path/NoScheme.purs +++ b/src/URI/Path/NoScheme.purs @@ -4,7 +4,7 @@ import Prelude import Data.Array as Array import Data.Generic.Rep (class Generic) -import Data.Generic.Rep.Show (genericShow) +import Data.Show.Generic (genericShow) import Data.String as String import Data.Tuple (Tuple(..)) import Text.Parsing.Parser (Parser) diff --git a/src/URI/Path/Rootless.purs b/src/URI/Path/Rootless.purs index 302b511..0039274 100644 --- a/src/URI/Path/Rootless.purs +++ b/src/URI/Path/Rootless.purs @@ -4,7 +4,7 @@ import Prelude import Data.Array as Array import Data.Generic.Rep (class Generic) -import Data.Generic.Rep.Show (genericShow) +import Data.Show.Generic (genericShow) import Data.String as String import Data.Tuple (Tuple(..)) import Text.Parsing.Parser (Parser) diff --git a/src/URI/RelativePart.purs b/src/URI/RelativePart.purs index 37001ef..c73ff2c 100644 --- a/src/URI/RelativePart.purs +++ b/src/URI/RelativePart.purs @@ -20,9 +20,9 @@ import Prelude import Control.Alt ((<|>)) import Data.Either (Either(..), either) import Data.Generic.Rep (class Generic) -import Data.Generic.Rep.Show (genericShow) import Data.Lens (Traversal', wander) import Data.Maybe (Maybe(..), maybe) +import Data.Show.Generic (genericShow) import Text.Parsing.Parser (Parser) import URI.Authority (Authority(..), AuthorityOptions, AuthorityParseOptions, AuthorityPrintOptions, Host(..), IPv4Address, IPv6Address, Port, RegName, UserInfo, _IPv4Address, _IPv6Address, _NameAddress, _hosts, _userInfo) import URI.Authority as Authority diff --git a/src/URI/RelativeRef.purs b/src/URI/RelativeRef.purs index b8a1507..ab23d16 100644 --- a/src/URI/RelativeRef.purs +++ b/src/URI/RelativeRef.purs @@ -18,9 +18,9 @@ import Prelude import Data.Array as Array import Data.Either (Either) import Data.Generic.Rep (class Generic) -import Data.Generic.Rep.Show (genericShow) import Data.Lens (Lens', lens) import Data.Maybe (Maybe(..)) +import Data.Show.Generic (genericShow) import Data.String as String import Text.Parsing.Parser (Parser) import Text.Parsing.Parser.Combinators (optionMaybe) diff --git a/src/URI/URI.purs b/src/URI/URI.purs index f1489ee..25e35a5 100644 --- a/src/URI/URI.purs +++ b/src/URI/URI.purs @@ -19,9 +19,9 @@ import Prelude import Data.Array as Array import Data.Either (Either) import Data.Generic.Rep (class Generic) -import Data.Generic.Rep.Show (genericShow) import Data.Lens (Lens', lens) import Data.Maybe (Maybe(..)) +import Data.Show.Generic (genericShow) import Data.String as String import Text.Parsing.Parser (Parser) import Text.Parsing.Parser.Combinators (optionMaybe)