Melange v3 long-lived branch (#821)

* feat: support melange v3 * update * variadic instead of splice * update to pipe-last * update opam files * chore: update for released 5.1.1 * update for latest changes * chore: update nix flakes * require Melange v3 * fix: tests * chore: add changelog entry --------- Co-authored-by: Javier Chavarri <[email protected]>
reasonml · Feb 7, 2024 · f9052c1 · f9052c1
1 parent 012974e
commit f9052c1
Show file tree

Hide file tree

Showing 19 changed files with 177 additions and 170 deletions.
diff --git a/.github/workflows/opam.yml b/.github/workflows/opam.yml
@@ -24,7 +24,7 @@ jobs:
           # disabling this for now
 
         ocaml-compiler:
-          - 5.1.x
+          - 5.1.1
 
     runs-on: ${{ matrix.os }}
 

diff --git a/CHANGES.md b/CHANGES.md
@@ -7,6 +7,7 @@
 * Wrap the `React` library, exposing just a single top-level module
   (@anmonteiro in [#783](https://github.com/reasonml/reason-react/pull/783))
 * Re-organise toplevel modules (@davesnx in [#794](https://github.com/reasonml/reason-react/pull/794))
+* Require and adapt to Melange v3 (@anmonteiro in [#821](https://github.com/reasonml/reason-react/pull/821))
 
 # 0.12.0
 

diff --git a/Makefile b/Makefile
@@ -58,7 +58,7 @@ install: ## Update the package dependencies when new deps are added to dune-proj
 
 .PHONY: init
 create-switch: ## Create a local opam switch
-	@opam switch create . 5.1.0 --no-install
+	@opam switch create . 5.1.1 --no-install
 
 .PHONY: init
 init: create-switch install ## Create a local opam switch, install deps
diff --git a/dune-project b/dune-project
@@ -34,9 +34,11 @@
   "ReasonReact helps you use Reason to build React components with deeply integrated, strong, static type safety.\n\nIt is designed and built by people using Reason and React in large, mission critical production React codebases.")
  (depends
   (ocaml
-   (and (>= 5.1.0) (< 5.2.0)))
+   (and
+    (>= 5.1.1)
+    (< 5.2.0)))
   (melange
-   (>= 2.0.0))
+   (>= 3.0.0))
   (reason-react-ppx
    (= :version))
   (reason
@@ -56,15 +58,17 @@
  (synopsis "React.js JSX PPX")
  (description "ReasonReact JSX PPX")
  (depends
-    (ocaml
-   (and (>= 5.1.0) (< 5.2.0)))
+  (ocaml
+   (and
+    (>= 5.1.1)
+    (< 5.2.0)))
   (reason
    (>= 3.10.0))
   (ppxlib
    (>= 0.28.0))
   (merlin
    (and
-    (= 4.9-501preview)
+    (= 4.13.1-501)
     :with-test))
   (ocamlformat
    (and

diff --git a/flake.lock b/flake.lock
-Original file line number
+Diff line change
@@ Expand Up / @@ -24,7 +24,7 @@ jobs: @@
               # disabling this for now
             ocaml-compiler:
-              - 5.1.x
+              - 5.1.1
         runs-on: ${{ matrix.os }}
@@ Expand Down @@