From e3ce1d7f5d39d783d076c1e9e897b140361c9aa3 Mon Sep 17 00:00:00 2001 From: Jordan Martinez Date: Thu, 10 Dec 2020 17:43:06 -0800 Subject: [PATCH 1/7] Update Bower dependencies to master --- bower.json | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/bower.json b/bower.json index e98dd21..122bcf7 100644 --- a/bower.json +++ b/bower.json @@ -15,14 +15,14 @@ "package.json" ], "dependencies": { - "purescript-prelude": "^4.0.0", - "purescript-effect": "^2.0.0", - "purescript-http-methods": "^4.0.0", - "purescript-typelevel-prelude": "^5.0.0", - "purescript-web-file": "^2.3.0", - "purescript-record": "^2.0.0", - "purescript-foreign-object": "^2.0.0", - "purescript-web-promise": "https://github.com/purescript-web/purescript-web-promise.git#^1.0.0", - "purescript-web-streams": "https://github.com/purescript-web/purescript-web-streams.git#^1.0.0" + "purescript-prelude": "master", + "purescript-effect": "master", + "purescript-http-methods": "master", + "purescript-typelevel-prelude": "master", + "purescript-web-file": "master", + "purescript-record": "master", + "purescript-foreign-object": "master", + "purescript-web-promise": "https://github.com/purescript-web/purescript-web-promise.git#master", + "purescript-web-streams": "https://github.com/purescript-web/purescript-web-streams.git#master" } } From 9e5f06094f6e5eddc0b913b9bc1db2ac7a56103e Mon Sep 17 00:00:00 2001 From: Jordan Martinez Date: Thu, 10 Dec 2020 17:43:06 -0800 Subject: [PATCH 2/7] Update to v0.14.0-rc3 purescript --- .github/workflows/ci.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 063845e..2e4c7a1 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -13,6 +13,8 @@ jobs: - uses: actions/checkout@v2 - uses: purescript-contrib/setup-purescript@main + with: + purescript: "0.14.0-rc3" - uses: actions/setup-node@v1 with: From c82fef2e7e4f3cab1204580f4ba4e76987373d6e Mon Sep 17 00:00:00 2001 From: Jordan Martinez Date: Thu, 10 Dec 2020 17:43:48 -0800 Subject: [PATCH 3/7] Fix dependencies --- bower.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/bower.json b/bower.json index 122bcf7..7e88e11 100644 --- a/bower.json +++ b/bower.json @@ -17,12 +17,12 @@ "dependencies": { "purescript-prelude": "master", "purescript-effect": "master", - "purescript-http-methods": "master", + "purescript-http-methods": "main", "purescript-typelevel-prelude": "master", "purescript-web-file": "master", "purescript-record": "master", "purescript-foreign-object": "master", - "purescript-web-promise": "https://github.com/purescript-web/purescript-web-promise.git#master", - "purescript-web-streams": "https://github.com/purescript-web/purescript-web-streams.git#master" + "purescript-web-promise": "master", + "purescript-web-streams": "master", } } From 62402d0466cf4b589e7e5765692c168176118f89 Mon Sep 17 00:00:00 2001 From: Jordan Martinez Date: Thu, 10 Dec 2020 17:51:00 -0800 Subject: [PATCH 4/7] Fix typo --- bower.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bower.json b/bower.json index 7e88e11..31f0913 100644 --- a/bower.json +++ b/bower.json @@ -23,6 +23,6 @@ "purescript-record": "master", "purescript-foreign-object": "master", "purescript-web-promise": "master", - "purescript-web-streams": "master", + "purescript-web-streams": "master" } } From 2d1c7a0207b1e3ee87ad18e6bc45f3d56da0aab6 Mon Sep 17 00:00:00 2001 From: Jordan Martinez Date: Thu, 10 Dec 2020 17:54:38 -0800 Subject: [PATCH 5/7] Switch back to long form for web-promise and web-streams --- bower.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/bower.json b/bower.json index 31f0913..5ac6856 100644 --- a/bower.json +++ b/bower.json @@ -22,7 +22,7 @@ "purescript-web-file": "master", "purescript-record": "master", "purescript-foreign-object": "master", - "purescript-web-promise": "master", - "purescript-web-streams": "master" + "purescript-web-promise": "https://github.com/purescript-web/purescript-web-promise.git#master", + "purescript-web-streams": "https://github.com/purescript-web/purescript-web-streams.git#master" } } From bc3de6b83a4a1c8a7f34b5d1a8a68f00e279dee2 Mon Sep 17 00:00:00 2001 From: Cyril Sobierajewicz Date: Fri, 11 Dec 2020 22:54:58 +0100 Subject: [PATCH 6/7] Fix RowList and deprecated syntax for row kinds --- src/Web/Fetch/Request.purs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/Web/Fetch/Request.purs b/src/Web/Fetch/Request.purs index db198dc..dfc4f2f 100644 --- a/src/Web/Fetch/Request.purs +++ b/src/Web/Fetch/Request.purs @@ -28,7 +28,7 @@ import Effect (Effect) import Effect.Uncurried (EffectFn2, runEffectFn2) import Foreign.Object (Object) import Prim.Row as Row -import Prim.RowList (kind RowList) +import Prim.RowList (RowList) import Prim.RowList as RowList import Record (merge) import Record.Builder as Record @@ -128,7 +128,7 @@ instance buildRequestOptionsRecord => BuildRequestOptions { | r } where buildRequestOptions r = merge (Record.build (convertOptions (RLProxy :: _ rl)) r) defaultOptions -class ConvertOptions (rl :: RowList) (input :: # Type) (output :: # Type) | rl input -> output where +class ConvertOptions (rl :: RowList Type) (input :: Row Type) (output :: Row Type) | rl input -> output where convertOptions :: RLProxy rl -> Record.Builder { | input } { | output } instance convertOptionsCons :: @@ -188,4 +188,4 @@ instance convertReferrerPolicy :: ConvertOption "referrerPolicy" ReferrerPolicy convertOption _ = identity instance convertIntegrity :: ConvertOption "integrity" Integrity Integrity where - convertOption _ = identity \ No newline at end of file + convertOption _ = identity From c681425fe6b61a1b652ea16b0b1cd73e8a517bb5 Mon Sep 17 00:00:00 2001 From: Cyril Sobierajewicz Date: Fri, 11 Dec 2020 22:57:21 +0100 Subject: [PATCH 7/7] Replace monomorphic proxies by Type.Proxy.Proxy and polymorphic variables --- src/Web/Fetch/Request.purs | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/Web/Fetch/Request.purs b/src/Web/Fetch/Request.purs index dfc4f2f..35ff325 100644 --- a/src/Web/Fetch/Request.purs +++ b/src/Web/Fetch/Request.purs @@ -22,7 +22,7 @@ import Data.HTTP.Method (Method(..)) import Data.Maybe (Maybe(..)) import Data.Newtype (un) import Data.Nullable (Nullable, toNullable) -import Data.Symbol (class IsSymbol, SProxy(..)) +import Data.Symbol (class IsSymbol) import Data.Tuple (Tuple) import Effect (Effect) import Effect.Uncurried (EffectFn2, runEffectFn2) @@ -32,7 +32,7 @@ import Prim.RowList (RowList) import Prim.RowList as RowList import Record (merge) import Record.Builder as Record -import Type.Data.RowList (RLProxy(..)) +import Type.Proxy (Proxy(..)) import Type.Row.Homogeneous (class Homogeneous) import Web.Fetch.Headers (Headers) import Web.Fetch.Headers as Headers @@ -126,10 +126,10 @@ instance buildRequestOptionsRecord , Row.Nub r'' RequestOptions ) => BuildRequestOptions { | r } where - buildRequestOptions r = merge (Record.build (convertOptions (RLProxy :: _ rl)) r) defaultOptions + buildRequestOptions r = merge (Record.build (convertOptions (Proxy :: _ rl)) r) defaultOptions class ConvertOptions (rl :: RowList Type) (input :: Row Type) (output :: Row Type) | rl input -> output where - convertOptions :: RLProxy rl -> Record.Builder { | input } { | output } + convertOptions :: forall rlproxy. rlproxy rl -> Record.Builder { | input } { | output } instance convertOptionsCons :: ( ConvertOptions rest input' output @@ -139,14 +139,14 @@ instance convertOptionsCons :: , IsSymbol field ) => ConvertOptions (RowList.Cons field from rest) input output where convertOptions _ = - convertOptions (RLProxy :: _ rest) - <<< Record.modify (SProxy :: _ field) (convertOption (SProxy :: _ field)) + convertOptions (Proxy :: _ rest) + <<< Record.modify (Proxy :: _ field) (convertOption (Proxy :: _ field)) instance convertOptionsNil :: ConvertOptions RowList.Nil r r where convertOptions _ = identity class ConvertOption (field :: Symbol) from to | field -> to where - convertOption :: SProxy field -> from -> to + convertOption :: forall sproxy. sproxy field -> from -> to instance convertMethod :: ConvertOption "method" Method Method where convertOption _ = identity