From 6f51a0878e85cb0174f82ebc89c137ab97e0fd93 Mon Sep 17 00:00:00 2001 From: Jordan Martinez Date: Fri, 11 Dec 2020 12:37:46 -0800 Subject: [PATCH 1/5] Add kind annotations --- src/CSS/Property.purs | 1 + src/CSS/Size.purs | 2 ++ src/CSS/Text/Shadow.purs | 1 + src/CSS/Transform.purs | 2 ++ 4 files changed, 6 insertions(+) diff --git a/src/CSS/Property.purs b/src/CSS/Property.purs index fa775fe..4d0bf23 100644 --- a/src/CSS/Property.purs +++ b/src/CSS/Property.purs @@ -37,6 +37,7 @@ plain (Plain p) = p quote :: String -> String quote s = "\"" <> s <> "\"" +newtype Key :: Type -> Type newtype Key a = Key Prefixed derive instance eqKey :: (Eq a) => Eq (Key a) diff --git a/src/CSS/Size.purs b/src/CSS/Size.purs index 93899a6..78e8b10 100644 --- a/src/CSS/Size.purs +++ b/src/CSS/Size.purs @@ -6,6 +6,7 @@ import CSS.Common (class Auto) import CSS.Property (class Val, Value, value) import CSS.String (class IsString, fromString) +newtype Size :: Type -> Type newtype Size a = Size Value derive instance eqSize :: Eq a => Eq (Size a) @@ -77,6 +78,7 @@ sym f a = f a a a a data Deg data Rad +newtype Angle :: Type -> Type newtype Angle a = Angle Value derive instance eqAngle :: Eq a => Eq (Angle a) diff --git a/src/CSS/Text/Shadow.purs b/src/CSS/Text/Shadow.purs index a42538f..66bd67d 100644 --- a/src/CSS/Text/Shadow.purs +++ b/src/CSS/Text/Shadow.purs @@ -8,6 +8,7 @@ import CSS.String (fromString) import CSS.Stylesheet (CSS, key) import Data.Tuple.Nested (tuple4) +data TextShadow :: Type -> Type data TextShadow a = TextShadow (Size a) (Size a) (Size a) (Color) | None diff --git a/src/CSS/Transform.purs b/src/CSS/Transform.purs index 2d83385..4af4612 100644 --- a/src/CSS/Transform.purs +++ b/src/CSS/Transform.purs @@ -99,12 +99,14 @@ matrix3d w0 x0 y0 z0 , w3, x3, y3, z3 ] <> fromString ")" +data TransformOrigin :: Type -> Type data TransformOrigin a = TransformOrigin (TransformOriginOffset a) (TransformOriginOffset a) (Size a) | Initial | Inherit | Unset +data TransformOriginOffset :: Type -> Type data TransformOriginOffset a = OffsetLength (Size a) | OffsetTop From 5cbb3f702d72a7c1edff856caf49e188a499d00f Mon Sep 17 00:00:00 2001 From: Jordan Martinez Date: Fri, 11 Dec 2020 12:38:02 -0800 Subject: [PATCH 2/5] Fix dependencies --- bower.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bower.json b/bower.json index 6d2a730..ec5995c 100644 --- a/bower.json +++ b/bower.json @@ -25,7 +25,7 @@ "purescript-nonempty": "master", "purescript-profunctor": "master", "purescript-strings": "master", - "purescript-these": "master", + "purescript-these": "main", "purescript-transformers": "master", "purescript-colors": "master", "purescript-console": "master" From 9874b036565aea177e8d27903e76368f78785cdb Mon Sep 17 00:00:00 2001 From: Jordan Martinez Date: Fri, 11 Dec 2020 12:38:33 -0800 Subject: [PATCH 3/5] Update to v0.14.0-rc3 in ci --- .github/workflows/ci.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 6b0550f..d91f17d 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -15,6 +15,8 @@ jobs: - name: Set up a PureScript toolchain uses: purescript-contrib/setup-purescript@main + with: + purescript: "0.14.0-rc3" - name: Cache PureScript dependencies uses: actions/cache@v2 From d12b730797b025fffe0746adb0b5872817f8ccf5 Mon Sep 17 00:00:00 2001 From: Jordan Martinez Date: Fri, 11 Dec 2020 12:55:53 -0800 Subject: [PATCH 4/5] Update package set to prepare-0.14 --- packages.dhall | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages.dhall b/packages.dhall index 80f5fe6..39a31d0 100644 --- a/packages.dhall +++ b/packages.dhall @@ -1,4 +1,4 @@ let upstream = - https://github.com/purescript/package-sets/releases/download/psc-0.13.8-20201007/packages.dhall sha256:35633f6f591b94d216392c9e0500207bb1fec42dd355f4fecdfd186956567b6b + https://raw.githubusercontent.com/purescript/package-sets/prepare-0.14/src/packages.dhall in upstream From 808c6c6965f90dbade668778ffa28a934e005093 Mon Sep 17 00:00:00 2001 From: Thomas Honeyman Date: Fri, 11 Dec 2020 16:08:31 -0800 Subject: [PATCH 5/5] Use foldl1 from semigroup --- src/CSS/Render.purs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/CSS/Render.purs b/src/CSS/Render.purs index 73db1b1..622c3ca 100644 --- a/src/CSS/Render.purs +++ b/src/CSS/Render.purs @@ -10,7 +10,8 @@ import Data.Array (null, (:), drop, sort, uncons, mapMaybe) import Data.Either (Either(..), either) import Data.Foldable (fold, foldMap, intercalate) import Data.Maybe (Maybe(..), fromMaybe, maybe) -import Data.NonEmpty (NonEmpty(..), (:|), foldl1, oneOf) +import Data.NonEmpty (NonEmpty(..), (:|), oneOf) +import Data.Semigroup.Foldable (foldl1) import Data.These (These(..), theseLeft, theseRight) import Data.Tuple (Tuple(..), lookup, uncurry) import Effect (Effect)