feat: migrate from bs.* to mel.* attributes (#755)

* feat: migrate from `bs.*` to `mel.*` attributes * melange2: remove mel.val * update tests * ci: update opam to use 5.1.x * add melange.dom to libraries * test(ci): fix flakes / OCaml version / add melange.dom * rm dupe --------- Co-authored-by: Javier Chavarri <[email protected]>
reasonml · Sep 13, 2023 · c5c90e0 · c5c90e0
1 parent 78403cd
commit c5c90e0
Show file tree

Hide file tree

Showing 26 changed files with 1,491 additions and 1,463 deletions.
diff --git a/.github/workflows/nix.yml b/.github/workflows/nix.yml
@@ -14,7 +14,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        ocamlVersion: [4_14, 5_0]
+        ocamlVersion: [5_1]
     steps:
     - uses: actions/checkout@v2
     - uses: cachix/install-nix-action@v21

diff --git a/.github/workflows/opam.yml b/.github/workflows/opam.yml
@@ -24,7 +24,7 @@ jobs:
           # disabling this for now
 
         ocaml-compiler:
-          - 4.14.x
+          - ocaml-variants.5.1.0+trunk
 
     runs-on: ${{ matrix.os }}
 

diff --git a/Makefile b/Makefile
@@ -53,13 +53,14 @@ format-check: ## Checks if format is correct
 
 .PHONY: install
 install: ## Update the package dependencies when new deps are added to dune-project
-	@opam pin add -y melange --dev-repo
+	@opam pin add -y melange.dev --dev-repo
+	@opam pin add -y reason.dev --dev-repo
 	@opam install . --deps-only --with-test
 	@npm install
 
 .PHONY: init
 create-switch: ## Create a local opam switch
-	@opam switch create . 4.14.1 --no-install
+	@opam switch create . 5.1.0~alpha2 --no-install
 
 .PHONY: init
 init: create-switch install ## Create a local opam switch, install deps
diff --git a/flake.lock b/flake.lock
diff --git a/flake.nix b/flake.nix
@@ -20,7 +20,7 @@
     flake-utils.lib.eachDefaultSystem (system:
       let
         pkgs = nixpkgs.legacyPackages."${system}".appendOverlays [
-          (self: super: { ocamlPackages = super.ocaml-ng.ocamlPackages_4_14; })
+          (self: super: { ocamlPackages = super.ocaml-ng.ocamlPackages_5_1; })
           melange.overlays.default
         ];
       in

diff --git a/ppx/reason_react_ppx.ml b/ppx/reason_react_ppx.ml
@@ -368,7 +368,7 @@ let makePropsValue fnName loc namedArgListWithKeyAndRef propsType =
     pval_attributes =
       [
         {
-          attr_name = { txt = "bs.obj"; loc };
+          attr_name = { txt = "mel.obj"; loc };
           attr_payload = PStr [];
           attr_loc = loc;
         };