chore: move reactjs-jsx-ppx to reasonml/reason-react

.github/workflows/esy-build.yml

@@ -48,7 +48,7 @@ jobs:
         if: ${{ matrix.system == 'ubuntu' }}
         run: |
           git clone https://github.com/melange-re/melange-basic-template.git
-          cd melange-basic-template && git checkout anmonteiro/1.0-release
+          cd melange-basic-template
 
       - name: Remove esy.lock in template
         if: ${{ matrix.system == 'ubuntu' }}
@@ -59,7 +59,7 @@ jobs:
         if: ${{ matrix.system == 'ubuntu' }}
         working-directory: melange-basic-template
         run: |
-          sed -i 's@"installConfig"@"resolutions": { "\@opam/reactjs-jsx-ppx": "melange-re/melange:reactjs-jsx-ppx.opam#'"$GITHUB_SHA"'","\@opam/melange": "melange-re/melange:melange.opam#'"$GITHUB_SHA"'", "\@opam/reason-react": "jchavarri/reason-react:reason-react.opam#27de44aed71ca4ccc902952e6a3203d663a23bcb"},"installConfig"@' esy.json
+          sed -i 's@"installConfig"@"resolutions": { "\@opam/reactjs-jsx-ppx": "reasonml/reason-react:reactjs-jsx-ppx.opam#587ea8fb55e5a98512557417f1576b497e573240","\@opam/melange": "melange-re/melange:melange.opam#'"$GITHUB_SHA"'", "\@opam/reason-react": "reasonml/reason-react:reason-react.opam#587ea8fb55e5a98512557417f1576b497e573240"},"installConfig"@' esy.json
       - name: Build basic template
         if: ${{ matrix.system == 'ubuntu' }}
         working-directory: melange-basic-template

.github/workflows/opam-build.yml

@@ -65,7 +65,7 @@ jobs:
       - name: Install all deps
         working-directory: melange-opam-template
         run: |
-          opam pin add reason-react -y git+https://github.com/reasonml/reason-react.git#anmonteiro-patch-1
+          opam pin add reason-react -y git+https://github.com/reasonml/reason-react.git#587ea8fb55e5a98512557417f1576b497e573240
           npm install --legacy-peer-deps
 
       - name: Build basic template

Makefile

@@ -21,15 +21,15 @@ dev:
 
 .PHONY: test
 test:
-	opam exec -- dune runtest -p melange,reactjs-jsx-ppx,rescript-syntax
+	opam exec -- dune runtest -p melange,rescript-syntax
 
 .PHONY: opam-create-switch
 opam-create-switch: ## Create opam switch
 	opam switch create . 4.14.1 -y --no-install
 
 .PHONY: opam-install-test
 opam-install-test: ## Install test dependencies
-	opam pin add reactjs-jsx-ppx.dev . --with-test -y
+	opam pin add reactjs-jsx-ppx.dev -y git+https://github.com/reasonml/reason-react.git#587ea8fb55e5a98512557417f1576b497e573240
 	opam pin add melange.dev . --with-test -y
 	opam pin add rescript-syntax.dev . --with-test -y
 

dune-project

@@ -57,11 +57,3 @@
    (= :version))
   (ppxlib
    (>= "0.28.0"))))
-
-(package
- (name reactjs-jsx-ppx)
- (synopsis "ReactJS JSX PPX")
- (depends
-  ocaml
-  (ppxlib
-   (>= "0.28.0"))))

nix/ci/test.nix

@@ -22,6 +22,19 @@ let
           menhirLib = osuper.menhirLib_20230415;
           menhirSdk = osuper.menhirSdk_20230415;
           menhir = osuper.menhir_20230415;
+          reactjs-jsx-ppx = osuper.reactjs-jsx-ppx.overrideAttrs (_: {
+            postPatch = ''
+              rm -rf test/dune
+            '';
+            src = super.fetchFromGitHub {
+              owner = "reasonml";
+              repo = "reason-react";
+              rev = "f5a4a64bd7cd10e8477a563a77222ec8c85b873a";
+              hash = "sha256-HadgHdfUlbx/+8yZKLaj1tSMo0Uuu2xalwsGxrhBZ0E=";
+            };
+            patches = [ ];
+            doCheck = false;
+          });
         });
       })
     ];
@@ -68,8 +81,8 @@ stdenv.mkDerivation {
   ];
   buildInputs = [
     packages.melange
-    packages.reactjs-jsx-ppx
     packages.rescript-syntax
+    reactjs-jsx-ppx
   ];
 
   checkPhase = ''

nix/default.nix

@@ -62,7 +62,7 @@ rec {
       nodejs
       reason
     ];
-    checkInputs = [ ounit2 reactjs-jsx-ppx ];
+    checkInputs = [ ounit2 ];
 
     nativeBuildInputs = [ menhir cppo git makeWrapper ];
     propagatedBuildInputs = [
@@ -94,20 +94,4 @@ rec {
 
     meta.mainProgram = "rescript-syntax";
   };
-
-  reactjs-jsx-ppx = buildDunePackage {
-    pname = "reactjs-jsx-ppx";
-    version = "dev";
-    duneVersion = "3";
-
-    src = with nix-filter; filter {
-      root = ./..;
-      include = [
-        "dune-project"
-        "reactjs-jsx-ppx.opam"
-        "reactjs-jsx-ppx"
-      ];
-    };
-    propagatedBuildInputs = [ ppxlib ];
-  };
 }