Add jsx config for V3 compatibility mode.

cristianoc · cristianoc · commit 5a399fae126e · 2022-09-21T17:18:16.000+02:00
diff --git a/docs/docson/build-schema.json b/docs/docson/build-schema.json
@@ -346,9 +346,9 @@
           "enum": ["classic", "automatic"],
           "description": "JSX transformation mode"
         },
-        "preserve-dependencies": {
+        "v3-dependencies": {
           "$ref": "#/definitions/dependencies",
-          "description": "Don't propagate the jsx configuration to these dependencies."
+          "description": "Build the given dependencies in JSX V3 compatibility mode."
         }
       },
       "additionalProperties": false,
diff --git a/jscomp/bsb/bsb_build_schemas.ml b/jscomp/bsb/bsb_build_schemas.ml
@@ -62,7 +62,7 @@ let jsx = "jsx"
 let jsx_version = "version"
 let jsx_module = "module"
 let jsx_mode = "mode"
-let jsx_preserve_dependencies = "preserve-dependencies"
+let jsx_v3_dependencies = "v3-dependencies"
 let entries = "entries"
 let backend = "backend"
 let main_module = "main-module"
diff --git a/jscomp/bsb/bsb_config_parse.ml b/jscomp/bsb/bsb_config_parse.ml
@@ -298,6 +298,17 @@ let interpret_json ~(package_kind : Bsb_package_kind.t) ~(per_proj_dir : string)
               (* ~namespace *)
               sources
           in
+          let jsx, bsc_flags =
+            match package_kind with
+            | (Pinned_dependency x | Dependency x)
+              when List.mem package_name x.jsx.v3_dependencies ->
+                ( { (Bsb_jsx.from_map map) with version = Some Jsx_v3 },
+                  "-open ReactV3"
+                  :: extract_string_list map Bsb_build_schemas.bsc_flags )
+            | _ ->
+                ( Bsb_jsx.from_map map,
+                  extract_string_list map Bsb_build_schemas.bsc_flags )
+          in
           {
             pinned_dependencies;
             gentype_config;
@@ -306,7 +317,7 @@ let interpret_json ~(package_kind : Bsb_package_kind.t) ~(per_proj_dir : string)
             warning = extract_warning map;
             external_includes =
               extract_string_list map Bsb_build_schemas.bs_external_includes;
-            bsc_flags = extract_string_list map Bsb_build_schemas.bsc_flags;
+            bsc_flags;
             ppx_files =
               extract_ppx map ~cwd:per_proj_dir Bsb_build_schemas.ppx_flags;
             pp_file = pp_flags;
@@ -332,12 +343,7 @@ let interpret_json ~(package_kind : Bsb_package_kind.t) ~(per_proj_dir : string)
             generate_merlin =
               extract_boolean map Bsb_build_schemas.generate_merlin false;
             reason_react_jsx;
-            jsx =
-              (match package_kind with
-              | (Pinned_dependency x | Dependency x)
-                when not (List.mem package_name x.jsx.preserve_dependencies) ->
-                  x.jsx
-              | _ -> Bsb_jsx.from_map map);
+            jsx;
             generators = extract_generators map;
             cut_generators;
           }
diff --git a/jscomp/bsb/bsb_jsx.ml b/jscomp/bsb/bsb_jsx.ml
@@ -7,7 +7,7 @@ type t = {
   version : version option;
   module_ : module_ option;
   mode : mode option;
-  preserve_dependencies : dependencies;
+  v3_dependencies : dependencies;
 }
 
 let encode_no_nl jsx =
@@ -35,7 +35,7 @@ let from_map map =
   let version : version option ref = ref None in
   let module_ : module_ option ref = ref None in
   let mode : mode option ref = ref None in
-  let preserve_dependencies : dependencies ref = ref [] in
+  let v3_dependencies : dependencies ref = ref [] in
   map
   |? ( Bsb_build_schemas.jsx,
        `Obj
@@ -79,17 +79,17 @@ let from_map map =
   |? ( Bsb_build_schemas.jsx,
        `Obj
          (fun m ->
-           match m.?(Bsb_build_schemas.jsx_preserve_dependencies) with
+           match m.?(Bsb_build_schemas.jsx_v3_dependencies) with
            | Some (Arr { content }) ->
-               preserve_dependencies := get_list_string content
+            v3_dependencies := get_list_string content
            | Some x ->
                Bsb_exception.config_error x
-                 "Unexpected input for jsx preserve-dependencies"
+                 "Unexpected input for jsx v3-dependencies"
            | None -> ()) )
   |> ignore;
   {
     version = !version;
     module_ = !module_;
     mode = !mode;
-    preserve_dependencies = !preserve_dependencies;
+    v3_dependencies = !v3_dependencies;
   }
diff --git a/lib/4.06.1/rescript.ml b/lib/4.06.1/rescript.ml
@@ -1748,7 +1748,7 @@ let jsx = "jsx"
 let jsx_version = "version"
 let jsx_module = "module"
 let jsx_mode = "mode"
-let jsx_preserve_dependencies = "preserve-dependencies"
+let jsx_v3_dependencies = "v3-dependencies"
 let entries = "entries"
 let backend = "backend"
 let main_module = "main-module"
@@ -5128,7 +5128,7 @@ type t = {
   version : version option;
   module_ : module_ option;
   mode : mode option;
-  preserve_dependencies : dependencies;
+  v3_dependencies : dependencies;
 }
 
 let encode_no_nl jsx =
@@ -5156,7 +5156,7 @@ let from_map map =
   let version : version option ref = ref None in
   let module_ : module_ option ref = ref None in
   let mode : mode option ref = ref None in
-  let preserve_dependencies : dependencies ref = ref [] in
+  let v3_dependencies : dependencies ref = ref [] in
   map
   |? ( Bsb_build_schemas.jsx,
        `Obj
@@ -5200,19 +5200,19 @@ let from_map map =
   |? ( Bsb_build_schemas.jsx,
        `Obj
          (fun m ->
-           match m.?(Bsb_build_schemas.jsx_preserve_dependencies) with
+           match m.?(Bsb_build_schemas.jsx_v3_dependencies) with
            | Some (Arr { content }) ->
-               preserve_dependencies := get_list_string content
+            v3_dependencies := get_list_string content
            | Some x ->
                Bsb_exception.config_error x
-                 "Unexpected input for jsx preserve-dependencies"
+                 "Unexpected input for jsx v3-dependencies"
            | None -> ()) )
   |> ignore;
   {
     version = !version;
     module_ = !module_;
     mode = !mode;
-    preserve_dependencies = !preserve_dependencies;
+    v3_dependencies = !v3_dependencies;
   }
 
 end
@@ -10593,6 +10593,17 @@ let interpret_json ~(package_kind : Bsb_package_kind.t) ~(per_proj_dir : string)
               (* ~namespace *)
               sources
           in
+          let jsx, bsc_flags =
+            match package_kind with
+            | (Pinned_dependency x | Dependency x)
+              when List.mem package_name x.jsx.v3_dependencies ->
+                ( { (Bsb_jsx.from_map map) with version = Some Jsx_v3 },
+                  "-open ReactV3"
+                  :: extract_string_list map Bsb_build_schemas.bsc_flags )
+            | _ ->
+                ( Bsb_jsx.from_map map,
+                  extract_string_list map Bsb_build_schemas.bsc_flags )
+          in
           {
             pinned_dependencies;
             gentype_config;
@@ -10601,7 +10612,7 @@ let interpret_json ~(package_kind : Bsb_package_kind.t) ~(per_proj_dir : string)
             warning = extract_warning map;
             external_includes =
               extract_string_list map Bsb_build_schemas.bs_external_includes;
-            bsc_flags = extract_string_list map Bsb_build_schemas.bsc_flags;
+            bsc_flags;
             ppx_files =
               extract_ppx map ~cwd:per_proj_dir Bsb_build_schemas.ppx_flags;
             pp_file = pp_flags;
@@ -10627,12 +10638,7 @@ let interpret_json ~(package_kind : Bsb_package_kind.t) ~(per_proj_dir : string)
             generate_merlin =
               extract_boolean map Bsb_build_schemas.generate_merlin false;
             reason_react_jsx;
-            jsx =
-              (match package_kind with
-              | (Pinned_dependency x | Dependency x)
-                when not (List.mem package_name x.jsx.preserve_dependencies) ->
-                  x.jsx
-              | _ -> Bsb_jsx.from_map map);
+            jsx;
             generators = extract_generators map;
             cut_generators;
           }
