Skip to content

Commit f9052c1

Browse files
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]>
1 parent 012974e commit f9052c1

File tree

19 files changed

+177
-170
lines changed

19 files changed

+177
-170
lines changed

.github/workflows/opam.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ jobs:
2424
# disabling this for now
2525

2626
ocaml-compiler:
27-
- 5.1.x
27+
- 5.1.1
2828

2929
runs-on: ${{ matrix.os }}
3030

CHANGES.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
* Wrap the `React` library, exposing just a single top-level module
88
(@anmonteiro in [#783](https://github.com/reasonml/reason-react/pull/783))
99
* Re-organise toplevel modules (@davesnx in [#794](https://github.com/reasonml/reason-react/pull/794))
10+
* Require and adapt to Melange v3 (@anmonteiro in [#821](https://github.com/reasonml/reason-react/pull/821))
1011

1112
# 0.12.0
1213

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ install: ## Update the package dependencies when new deps are added to dune-proj
5858

5959
.PHONY: init
6060
create-switch: ## Create a local opam switch
61-
@opam switch create . 5.1.0 --no-install
61+
@opam switch create . 5.1.1 --no-install
6262

6363
.PHONY: init
6464
init: create-switch install ## Create a local opam switch, install deps

dune-project

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -34,9 +34,11 @@
3434
"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.")
3535
(depends
3636
(ocaml
37-
(and (>= 5.1.0) (< 5.2.0)))
37+
(and
38+
(>= 5.1.1)
39+
(< 5.2.0)))
3840
(melange
39-
(>= 2.0.0))
41+
(>= 3.0.0))
4042
(reason-react-ppx
4143
(= :version))
4244
(reason
@@ -56,15 +58,17 @@
5658
(synopsis "React.js JSX PPX")
5759
(description "ReasonReact JSX PPX")
5860
(depends
59-
(ocaml
60-
(and (>= 5.1.0) (< 5.2.0)))
61+
(ocaml
62+
(and
63+
(>= 5.1.1)
64+
(< 5.2.0)))
6165
(reason
6266
(>= 3.10.0))
6367
(ppxlib
6468
(>= 0.28.0))
6569
(merlin
6670
(and
67-
(= 4.9-501preview)
71+
(= 4.13.1-501)
6872
:with-test))
6973
(ocamlformat
7074
(and

flake.lock

Lines changed: 13 additions & 13 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)