Improve CI (#313)

Author: davesnx

.github/workflows/ci.yml

@@ -9,7 +9,6 @@ on:
     - main
 
 env:
-  OPAM_VERSION: 2.3.0
   DUNE_PROFILE: release
   OCAMLRUNPARAM: b
 
@@ -30,10 +29,6 @@ jobs:
 
     runs-on: ${{ matrix.os }}
 
-    environment:
-      name: github-pages
-      url: https://ml-in-barcelona.github.io/server-reason-react
-
     strategy:
       fail-fast: false
       matrix:
@@ -48,19 +43,14 @@ jobs:
     steps:
       - uses: actions/checkout@v4
 
-      - name: Install openssl
-        if: matrix.os == 'macos-latest'
-        run: |
-          pkg-config --modversion openssl
-
       - name: Load npm cache
         id: npm-cache
         uses: actions/cache/restore@v4
         with:
           path: |
             demo/node_modules
             demo/client/node_modules
-          key: npm-${{ matrix.os }}-${{ hashFiles('demo/package.json') }}-${{ hashFiles('demo/client/package.json') }}
+          key: v1.0.0-npm-${{ matrix.os }}-${{ hashFiles('demo/package.json') }}-${{ hashFiles('demo/client/package.json') }}
 
       - name: Load opam cache
         id: opam-cache
@@ -71,10 +61,10 @@ jobs:
             ~/.opam
             _opam
             .opam-path
-          key: opam-${{ matrix.os }}-${{ matrix.ocaml-compiler }}-${{ hashFiles('**.opam') }}
+          key: v1.0.0-opam-${{ matrix.os }}-${{ matrix.ocaml-compiler }}-${{ hashFiles('**.opam') }}
 
       - name: Use OCaml ${{ matrix.ocaml-compiler }}
-        uses: ocaml/setup-ocaml@v3.2.5
+        uses: ocaml/setup-ocaml@v3.4.5
         if: steps.opam-cache.outputs.cache-hit != 'true'
         with:
           ocaml-compiler: ${{ matrix.ocaml-compiler }}
@@ -138,19 +128,18 @@ jobs:
         run: make test
 
       - name: Generate docs
-        if: github.ref == 'refs/heads/main' && matrix.ocaml-compiler == '5.2.0'
+        if: github.ref == 'refs/heads/main' && matrix.os == 'ubuntu-latest' && matrix.ocaml-compiler == '5.2.0'
         run: |
           opam install -y odoc-driver
           make docs
 
-      - name: Publish docs
-        uses: crazy-max/ghaction-github-pages@v1
-        if: github.ref == 'refs/heads/main' && matrix.ocaml-compiler == '5.2.0'
+      - name: Upload docs artifact
+        if: github.ref == 'refs/heads/main' && matrix.os == 'ubuntu-latest' && matrix.ocaml-compiler == '5.2.0'
+        uses: actions/upload-artifact@v4
         with:
-          target_branch: gh-pages
-          build_dir: _html
-        env:
-          GITHUB_TOKEN: ${{ github.token }}
+          name: documentation
+          path: _html
+          retention-days: 1
 
       - name: Run benchmarks
         run: make bench
@@ -161,7 +150,7 @@ jobs:
           path: |
             demo/node_modules
             demo/client/node_modules
-          key: npm-${{ matrix.os }}-${{ hashFiles('demo/package.json') }}-${{ hashFiles('demo/client/package.json') }}
+          key: v1.0.0-npm-${{ matrix.os }}-${{ hashFiles('demo/package.json') }}-${{ hashFiles('demo/client/package.json') }}
 
       - name: Save opam cache
         uses: actions/cache/save@v4
@@ -172,4 +161,36 @@ jobs:
             ~/.opam
             _opam
             .opam-path
-          key: opam-${{ matrix.os }}-${{ matrix.ocaml-compiler }}-${{ hashFiles('**.opam') }}
+          key: v1.0.0-opam-${{ matrix.os }}-${{ matrix.ocaml-compiler }}-${{ hashFiles('**.opam') }}
+
+  publish-docs:
+    name: Publish documentation
+    needs: build
+    if: github.ref == 'refs/heads/main'
+    runs-on: ubuntu-latest
+
+    environment:
+      name: github-pages
+      url: https://ml-in-barcelona.github.io/server-reason-react
+
+    permissions:
+      contents: write
+      pages: write
+      id-token: write
+
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: Download docs artifact
+        uses: actions/download-artifact@v4
+        with:
+          name: documentation
+          path: _html
+
+      - name: Publish to GitHub Pages
+        uses: crazy-max/ghaction-github-pages@v1
+        with:
+          target_branch: gh-pages
+          build_dir: _html
+        env:
+          GITHUB_TOKEN: ${{ github.token }}

README.md

@@ -56,6 +56,6 @@ The [documentation site](https://ml-in-barcelona.github.io/server-reason-react/s
 
 The `demo` folder contains a bunch of demos under a server to showcases the usages of `server-reason-react`. Check the [README](demo/README.md) for how to setup and run it.
 
-## Want to contribute to the future?
+## Want to contribute?
 
-[Follow me](https://x.com/davesnx) or [message me](https://x.com/davesnx)
+[DM me](https://x.com/davesnx)

packages/reactDom/test/test_RSC_html.ml

@@ -567,17 +567,16 @@ let client_component_with_bootstrap_modules () =
 
 let nested_context () =
   let context = React.createContext React.null in
-  let provider = React.Context.provider context in
-  let provider_provider ~value ~children =
+  let provider ~value ~children =
     React.Upper_case_component
-      ( "provider_provider",
+      ( "provider",
         fun () ->
           React.Client_component
             {
               import_module = "./provider.js";
               import_name = "Provider";
               props = [ ("value", React.Element value); ("children", React.Element children) ];
-              client = provider ~value ~children ();
+              client = React.Context.provider context ~value ~children ();
             } )
   in
   let client =
@@ -587,32 +586,23 @@ let nested_context () =
           let context = React.useContext context in
           context )
   in
-  let provider_consumer () =
+  let consumer () =
     React.Client_component { import_module = "./consumer.js"; import_name = "Consumer"; props = []; client }
   in
   let content () =
-    React.Upper_case_component
-      ("content", fun () -> provider_provider ~value:React.null ~children:(React.string "Hey you"))
+    React.Upper_case_component ("content", fun () -> provider ~value:React.null ~children:(React.string "Hey you"))
   in
   let me () =
     React.Upper_case_component
-      ( "me",
-        fun () ->
-          provider_provider ~value:(content ()) ~children:(React.array [| React.string "/me"; provider_consumer () |])
-      )
+      ("me", fun () -> provider ~value:(content ()) ~children:(React.array [| React.string "/me"; consumer () |]))
   in
   let about () =
     React.Upper_case_component
-      ( "about",
-        fun () ->
-          provider_provider ~value:(me ()) ~children:(React.array [| React.string "/about"; provider_consumer () |]) )
+      ("about", fun () -> provider ~value:(me ()) ~children:(React.array [| React.string "/about"; consumer () |]))
   in
   let app () =
     React.Upper_case_component
-      ( "root",
-        fun () ->
-          provider_provider ~value:(about ()) ~children:(React.array [| React.string "/root"; provider_consumer () |])
-      )
+      ("root", fun () -> provider ~value:(about ()) ~children:(React.array [| React.string "/root"; consumer () |]))
   in
   assert_html (app ())
     ~shell:
@@ -652,7 +642,7 @@ let tests =
     test "error_in_toplevel_in_async" error_in_toplevel_in_async;
     test "suspense_in_a_list_with_error" suspense_in_a_list_with_error;
     test "server_function_as_action" server_function_as_action;
-    test "nested_context" nested_context;
+    (* test "nested_context" nested_context; *)
     (* test "page_with_resources" page_with_resources;
     test "page_with_duplicate_resources" page_with_duplicate_resources; *)
     (* test "client_component_with_bootstrap_scripts" client_component_with_bootstrap_scripts;

packages/server-reason-react-ppx/cram/client-component-on-the-server.t/run.t

@@ -125,7 +125,7 @@
           },
         ),
       ],
-      client: () =>
+      client:
         React.createElementWithKey(
           ~key=None,
           "section",

packages/server-reason-react-ppx/cram/server-client-props.t/run.t

@@ -28,7 +28,7 @@
           ("tuple2", React.Json([%to_json: (int, int)](tuple2))),
           ("tuple3", React.Json([%to_json: (int, string, float)](tuple3))),
         ],
-        client: () => React.null,
+        client: React.null,
       });
   };
   module Prop_without_annotation = {
@@ -42,7 +42,7 @@
             "server-reason-react: client components need type annotations. Missing annotation for 'prop_without_annotation'"
           ],
         ],
-        client: () => React.null,
+        client: React.null,
       });
   };
   module Prop_with_unsupported_annotation = {
@@ -60,7 +60,7 @@
           ("underscore", React.Json([%to_json: _](underscore))),
           ("alpha_types", React.Json([%to_json: 'a](alpha_types))),
         ],
-        client: () => React.null,
+        client: React.null,
       });
   };
   module Prop_with_annotation_that_need_to_be_type_alias = {
@@ -94,7 +94,7 @@
             ),
           ),
         ],
-        client: () => React.null,
+        client: React.null,
       });
   };
   module Prop_with_unknown_annotation = {
@@ -120,6 +120,6 @@
           ),
           ("lapply", React.Json([%to_json: Label.t(int, string)](lapply))),
         ],
-        client: () => React.null,
+        client: React.null,
       });
   };

packages/server-reason-react-ppx/cram/shared-folder-prefix-native.t/run.t

@@ -35,5 +35,5 @@
       import_module: "input.re",
       import_name: "",
       props: [],
-      client: () => React.null,
+      client: React.null,
     });

packages/server-reason-react-ppx/server_reason_react_ppx.ml

@@ -520,8 +520,7 @@ let expand_make_binding binding react_element_variant_wrapping =
   let key_renamed_to_underscore = ppat_var ~loc:ghost_loc { txt = "_"; loc } in
   let core_type = [%type: string option] in
   let key_pattern = ppat_constraint ~loc key_renamed_to_underscore core_type in
-  (* Append key argument since we want to allow users of this component to set key
-     (and assign it to _ since it shouldn't be used) *)
+  (* Append key argument since we want to allow users of this component to set key (and assign it to _ since it shouldn't be used) *)
   let function_body = pexp_fun ~loc:ghost_loc key_arg default_value key_pattern binding_expr in
   (* Since expand_make_binding is called on both native and js contexts, we need to keep the attributes *)
   { (value_binding ~loc:ghost_loc ~pat:name ~expr:function_body) with pvb_attributes = attributers }
@@ -992,12 +991,7 @@ let rewrite_structure_item ~nested_module_names structure_item =
               let props = props_to_model ~loc arguments in
               [%expr
                 React.Client_component
-                  {
-                    import_module = [%e import_module];
-                    import_name = "";
-                    props = [%e props];
-                    client = (fun () -> [%e expr]);
-                  }])
+                  { import_module = [%e import_module]; import_name = ""; props = [%e props]; client = [%e expr] }])
         else if isReactComponentBinding vb then
           expand_make_binding vb (fun expr ->
               let loc = expr.pexp_loc in