Merge branch 'main' of github.com:/reasonml/reason-react into 19

* 'main' of github.com:/reasonml/reason-react:
  test: update snapshot tests to melange v5 (#875)
  nix: remove nix-filter dependency (#874)
  chore(nix): remove flake-utils (#873)
  Get rid of .t from linguist (#868)

Author: davesnx

.gitattributes

@@ -1,2 +1,3 @@
 *.re linguist-language=Reason
 *.rei linguist-language=Reason
+*.t text eol=lf -linguist-detectable

flake.lock

@@ -2,93 +2,101 @@
   description = "Reason React Nix Flake";
 
   inputs = {
-    nix-filter.url = "github:numtide/nix-filter";
-    flake-utils.url = "github:numtide/flake-utils";
-    nixpkgs = {
-      url = "github:nix-ocaml/nix-overlays";
-      inputs.flake-utils.follows = "flake-utils";
-    };
+    nixpkgs.url = "github:nix-ocaml/nix-overlays";
   };
 
-  outputs = { self, nixpkgs, flake-utils, nix-filter }:
-    flake-utils.lib.eachDefaultSystem (system:
-      let
-        pkgs = nixpkgs.legacyPackages."${system}".appendOverlays [
-          (self: super: { ocamlPackages = super.ocaml-ng.ocamlPackages_5_2; })
-        ];
+  outputs = { self, nixpkgs }:
+    let
+      forAllSystems = f: nixpkgs.lib.genAttrs nixpkgs.lib.systems.flakeExposed (system:
+        let
+          pkgs = nixpkgs.legacyPackages.${system}.extend (self: super: {
+            ocamlPackages = super.ocaml-ng.ocamlPackages_5_2.overrideScope (oself: osuper: {
+              ppxlib = osuper.ppxlib.overrideAttrs (o: {
+                propagatedBuildInputs = o.propagatedBuildInputs ++ [ osuper.stdio ];
+              });
+            });
+          });
+        in
+        f pkgs);
+    in
+    {
+      packages = forAllSystems (pkgs:
+        let
+          inherit (pkgs.ocamlPackages)
+            buildDunePackage melange merlin ppxlib reason;
+          packages = rec {
+            reason-react-ppx = buildDunePackage {
+              pname = "reason-react-ppx";
+              version = "n/a";
 
-        makeDevShell = { packages, release-mode ? false }:
-          pkgs.mkShell {
-            # dontDetectOcamlConflicts = true;
-            inputsFrom = pkgs.lib.attrValues packages;
-            nativeBuildInputs =
-              with pkgs.ocamlPackages; [ ocamlformat pkgs.nodejs_latest ]
-                ++ pkgs.lib.optionals release-mode (with pkgs; [
-                cacert
-                curl
-                ocamlPackages.dune-release
-                ocamlPackages.odoc
-                git
-              ]);
-            propagatedBuildInputs = with pkgs.ocamlPackages; [ merlin ];
-          };
-      in
+              src =
+                let fs = pkgs.lib.fileset; in
+                fs.toSource {
+                  root = ./.;
+                  fileset = fs.unions [
+                    ./dune-project
+                    ./dune
+                    ./reason-react-ppx.opam
+                    ./ppx
+                  ];
+                };
 
-      rec {
-        packages = with pkgs.ocamlPackages; rec {
-          reason-react-ppx = buildDunePackage {
-            pname = "reason-react-ppx";
-            version = "n/a";
-            src = with nix-filter.lib; filter {
-              root = ./.;
-              include = [
-                "dune-project"
-                "dune"
-                "reason-react-ppx.opam"
-                "reason-react.opam"
-                "ppx"
-              ];
+              # Due to a Reason version mismatch, the generated OCaml PPX diff
+              # looks different
+              doCheck = false;
+              propagatedBuildInputs = [ ppxlib ];
             };
-            # Due to a Reason version mismatch, the generated OCaml PPX diff
-            # looks different
-            doCheck = false;
-            checkInputs = [ ];
-            checkPhase = "dune build @runtest -p reason-react,reason-react-ppx";
-            nativeCheckInputs = [ reason merlin pkgs.jq ];
-            propagatedBuildInputs = [ ppxlib ];
-          };
 
-          reason-react = buildDunePackage {
-            pname = "reason-react";
-            version = "n/a";
-            src = with nix-filter.lib; filter {
-              root = ./.;
-              include = [
-                "dune-project"
-                "dune"
-                "reason-react-ppx.opam"
-                "reason-react.opam"
-                "src"
-                "test"
-              ];
+            reason-react = buildDunePackage {
+              pname = "reason-react";
+              version = "n/a";
+
+              src =
+                let fs = pkgs.lib.fileset; in
+                fs.toSource {
+                  root = ./.;
+                  fileset = fs.unions [
+                    ./dune-project
+                    ./dune
+                    ./reason-react.opam
+                    ./src
+                    ./test
+                  ];
+                };
+
+              doCheck = true;
+              nativeBuildInputs = [ melange reason ];
+              propagatedBuildInputs = [ melange reason-react-ppx ];
             };
-            doCheck = true;
-            nativeBuildInputs = [ pkgs.ocamlPackages.melange reason ];
-            propagatedBuildInputs = [
-              pkgs.ocamlPackages.melange
-              reason-react-ppx
-            ];
           };
+        in
+        packages // { default = packages.reason-react; });
 
-          default = packages.reason-react;
-        };
-
-        devShells = {
+      devShells = forAllSystems (pkgs:
+        let
+          makeDevShell = { packages, release-mode ? false }:
+            pkgs.mkShell {
+              # dontDetectOcamlConflicts = true;
+              inputsFrom = pkgs.lib.attrValues packages;
+              nativeBuildInputs =
+                with pkgs.ocamlPackages; [ ocamlformat pkgs.nodejs_latest ]
+                  ++ pkgs.lib.optionals release-mode (with pkgs; [
+                  cacert
+                  curl
+                  ocamlPackages.dune-release
+                  ocamlPackages.odoc
+                  git
+                ]);
+              propagatedBuildInputs = with pkgs.ocamlPackages; [ merlin ];
+            };
+          packages = self.packages.${pkgs.system};
+        in
+        {
           default = makeDevShell { inherit packages; };
           release = makeDevShell {
             inherit packages;
             release-mode = true;
           };
-        };
-      });
+        });
+    };
 }

flake.nix

@@ -40,16 +40,16 @@ Demonstrate how to use the React JSX PPX
   
   function X$App(Props) {
     return Belt__Belt_List.toArray(Belt__Belt_List.map({
-                    hd: "Hello!",
-                    tl: {
-                      hd: "This is React!",
-                      tl: /* [] */0
-                    }
-                  }, (function (greeting) {
-                      return JsxRuntime.jsx("h1", {
-                                  children: greeting
-                                });
-                    })));
+      hd: "Hello!",
+      tl: {
+        hd: "This is React!",
+        tl: /* [] */ 0
+      }
+    }, (function (greeting) {
+      return JsxRuntime.jsx("h1", {
+        children: greeting
+      });
+    })));
   }
   
   const App = {
@@ -60,5 +60,7 @@ Demonstrate how to use the React JSX PPX
   
   JsxRuntime.jsx(X$App, {});
   
-  exports.App = App;
+  module.exports = {
+    App,
+  }
   /*  Not a pure module */

ppx/test/react.t

@@ -24,10 +24,12 @@
   const React = require("react");
   
   const cb = React.useCallback((function (a, b) {
-          return a + b | 0;
-        }), []);
+    return a + b | 0;
+  }), []);
   
-  exports.cb = cb;
+  module.exports = {
+    cb,
+  }
   /* cb Not a pure module */
 
 Using an Uncurried function:
@@ -45,9 +47,11 @@ Using an Uncurried function:
   const React = require("react");
   
   const cb = React.useCallback((function (a, b) {
-          return a + b | 0;
-        }), []);
+    return a + b | 0;
+  }), []);
   
-  exports.cb = cb;
+  module.exports = {
+    cb,
+  }
   /* cb Not a pure module */