From be734d017fe6643c02f1e1db0eb82c3d2f32f61a Mon Sep 17 00:00:00 2001 From: ArthurW Date: Fri, 30 Aug 2024 15:21:16 +0200 Subject: [PATCH 1/7] Update Graphiql version --- graphql-cohttp/src/assets/index.html | 201 +++++++++++++-------------- 1 file changed, 98 insertions(+), 103 deletions(-) diff --git a/graphql-cohttp/src/assets/index.html b/graphql-cohttp/src/assets/index.html index 5493e67..6326770 100644 --- a/graphql-cohttp/src/assets/index.html +++ b/graphql-cohttp/src/assets/index.html @@ -1,122 +1,117 @@ - - - + + + + + + GraphQL API - - - - - - + + +
+ Loading… +
+ + + + From 6d346e247f86e1dd8c7287edfac9e83cf6843763 Mon Sep 17 00:00:00 2001 From: ArthurW Date: Fri, 30 Aug 2024 16:59:43 +0200 Subject: [PATCH 2/7] Fix CI: opam lowerbound for fmt --- graphql_parser.opam | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/graphql_parser.opam b/graphql_parser.opam index 872916c..654dc88 100644 --- a/graphql_parser.opam +++ b/graphql_parser.opam @@ -16,7 +16,7 @@ depends: [ "dune" {>= "1.1"} "menhir" {build} "alcotest" {with-test & >= "0.8.1"} - "fmt" + "fmt" {>= "0.8.7"} "re" {>= "1.5.0"} ] From 706ff3dc60a4bc1a0a23e5fee6f71291d8eef619 Mon Sep 17 00:00:00 2001 From: ArthurW Date: Fri, 30 Aug 2024 17:00:50 +0200 Subject: [PATCH 3/7] Fix CI: ocamlformat version --- .ocamlformat | 1 + dune-project | 2 -- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/.ocamlformat b/.ocamlformat index f949767..5d6f202 100644 --- a/.ocamlformat +++ b/.ocamlformat @@ -1 +1,2 @@ +version = 0.26.2 profile = conventional diff --git a/dune-project b/dune-project index ee5bc61..652565a 100644 --- a/dune-project +++ b/dune-project @@ -3,5 +3,3 @@ (name ocaml-graphql-server) (using menhir 2.0) - -(using fmt 1.2) From 39b7945b3c09f0b805b776be2abd1e11bf6901ee Mon Sep 17 00:00:00 2001 From: ArthurW Date: Fri, 30 Aug 2024 17:02:00 +0200 Subject: [PATCH 4/7] Fix CI: graphql-async, add missing dependency to ppx_sexp_conv --- graphql-async.opam | 1 + 1 file changed, 1 insertion(+) diff --git a/graphql-async.opam b/graphql-async.opam index 88d52c9..a47644f 100644 --- a/graphql-async.opam +++ b/graphql-async.opam @@ -19,6 +19,7 @@ depends: [ "alcotest" {with-test} "async_unix" {with-test & >= "v0.9.0"} "yojson" {with-test & >= "1.6.0"} + "ppx_sexp_conv" {>= "v0.16.0"} ] synopsis: "Build GraphQL schemas with Async support" From 05ce1def3189b5b61e2b3f49b28e367bdb71ddb3 Mon Sep 17 00:00:00 2001 From: ArthurW Date: Fri, 30 Aug 2024 17:07:07 +0200 Subject: [PATCH 5/7] Fix CI: graphql-async, compatibility with async_kernel recent releases --- graphql-async/src/graphql_async.ml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/graphql-async/src/graphql_async.ml b/graphql-async/src/graphql_async.ml index 9b50535..2c32a7e 100644 --- a/graphql-async/src/graphql_async.ml +++ b/graphql-async/src/graphql_async.ml @@ -10,10 +10,9 @@ module Schema = let map t f = Async_kernel.Pipe.map' t ~f:(fun q -> - Async_kernel.Deferred.Queue.map q ~f) + Async_kernel.Deferred.Queue.map q ~f ~how:`Sequential) let iter t f = Async_kernel.Pipe.iter t ~f - let close = Async_kernel.Pipe.close_read end end) @@ -21,6 +20,5 @@ module Schema = type t = string let message_of_field_error t = t - let extensions_of_field_error _t = None end) From fea6d2507b206744c5acb9bd0de418705b59d4f1 Mon Sep 17 00:00:00 2001 From: ArthurW Date: Fri, 30 Aug 2024 17:30:09 +0200 Subject: [PATCH 6/7] Fix CI: add missing MIT license to opam --- graphql-async.opam | 1 + graphql-cohttp.opam | 1 + graphql-lwt.opam | 1 + graphql.opam | 1 + graphql_parser.opam | 1 + 5 files changed, 5 insertions(+) diff --git a/graphql-async.opam b/graphql-async.opam index a47644f..7c41436 100644 --- a/graphql-async.opam +++ b/graphql-async.opam @@ -5,6 +5,7 @@ homepage: "https://github.com/andreas/ocaml-graphql-server" doc: "https://andreas.github.io/ocaml-graphql-server/" bug-reports: "https://github.com/andreas/ocaml-graphql-server/issues" dev-repo: "git+https://github.com/andreas/ocaml-graphql-server.git" +license: "MIT" build: [ ["dune" "build" "-p" name "-j" jobs] diff --git a/graphql-cohttp.opam b/graphql-cohttp.opam index d9a839b..1c03232 100644 --- a/graphql-cohttp.opam +++ b/graphql-cohttp.opam @@ -5,6 +5,7 @@ homepage: "https://github.com/andreas/ocaml-graphql-server" doc: "https://andreas.github.io/ocaml-graphql-server/" bug-reports: "https://github.com/andreas/ocaml-graphql-server/issues" dev-repo: "git+https://github.com/andreas/ocaml-graphql-server.git" +license: "MIT" build: [ ["dune" "build" "-p" name "-j" jobs] diff --git a/graphql-lwt.opam b/graphql-lwt.opam index 8172f9f..95f56b7 100644 --- a/graphql-lwt.opam +++ b/graphql-lwt.opam @@ -5,6 +5,7 @@ homepage: "https://github.com/andreas/ocaml-graphql-server" doc: "https://andreas.github.io/ocaml-graphql-server/" bug-reports: "https://github.com/andreas/ocaml-graphql-server/issues" dev-repo: "git+https://github.com/andreas/ocaml-graphql-server.git" +license: "MIT" build: [ ["dune" "build" "-p" name "-j" jobs] diff --git a/graphql.opam b/graphql.opam index 18c514b..b98c398 100644 --- a/graphql.opam +++ b/graphql.opam @@ -5,6 +5,7 @@ homepage: "https://github.com/andreas/ocaml-graphql-server" doc: "https://andreas.github.io/ocaml-graphql-server/" bug-reports: "https://github.com/andreas/ocaml-graphql-server/issues" dev-repo: "git+https://github.com/andreas/ocaml-graphql-server.git" +license: "MIT" build: [ ["dune" "build" "-p" name "-j" jobs] diff --git a/graphql_parser.opam b/graphql_parser.opam index 654dc88..98d7f23 100644 --- a/graphql_parser.opam +++ b/graphql_parser.opam @@ -5,6 +5,7 @@ homepage: "https://github.com/andreas/ocaml-graphql-server" doc: "https://andreas.github.io/ocaml-graphql-server/" bug-reports: "https://github.com/andreas/ocaml-graphql-server/issues" dev-repo: "git+https://github.com/andreas/ocaml-graphql-server.git" +license: "MIT" build: [ ["dune" "build" "-p" name "-j" jobs] From d41c99b7d642526080f7f3f4c0c4ea02f2aaa9af Mon Sep 17 00:00:00 2001 From: ArthurW Date: Fri, 30 Aug 2024 17:33:02 +0200 Subject: [PATCH 7/7] Fix CI: add menhir version lowerbound --- graphql_parser.opam | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/graphql_parser.opam b/graphql_parser.opam index 98d7f23..c1e4045 100644 --- a/graphql_parser.opam +++ b/graphql_parser.opam @@ -15,7 +15,7 @@ build: [ depends: [ "ocaml" {>= "4.03.0"} "dune" {>= "1.1"} - "menhir" {build} + "menhir" {build & >= "20220210"} "alcotest" {with-test & >= "0.8.1"} "fmt" {>= "0.8.7"} "re" {>= "1.5.0"}