Remove JSX v3 (#7072)

* remove jsx v3

* fix genType tests

* fix test

* changelog

* remove syntax test expected

* remove v3 from build-schema

* remove makeProps from tests

Author: mununki

CHANGELOG.md

@@ -15,6 +15,7 @@
 #### :boom: Breaking Change
 
 - OCaml compatibility in the stdlib and primitives are dropped/deprecated. https://github.com/rescript-lang/rescript-compiler/pull/6984
+- Remove the JSX v3. https://github.com/rescript-lang/rescript-compiler/pull/7072
 
 #### :rocket: New Feature
 

docs/docson/build-schema.json

@@ -304,21 +304,12 @@
       },
       "description": "path to gentype, path resolution is similar to ReScript"
     },
-    "reason-specs": {
-      "type": "object",
-      "properties": {
-        "react-jsx": {
-          "$ref": "#/definitions/react-jsx-version",
-          "description": "Whether to apply the [RescriptReact](https://github.com/rescript-lang/rescript-react)-specific JSX PPX transformation."
-        }
-      }
-    },
     "jsx-specs": {
       "type": "object",
       "properties": {
         "version": {
           "type": "number",
-          "enum": [3, 4],
+          "enum": [4],
           "description": "Whether to apply the specific version of JSX PPX transformation"
         },
         "module": {
@@ -329,10 +320,6 @@
           "type": "string",
           "enum": ["classic", "automatic"],
           "description": "JSX transformation mode"
-        },
-        "v3-dependencies": {
-          "$ref": "#/definitions/dependencies",
-          "description": "Build the given dependencies in JSX V3 compatibility mode."
         }
       },
       "additionalProperties": false
@@ -422,10 +409,6 @@
       "type": "boolean",
       "description": "Configuration for the uncurried mode."
     },
-    "reason": {
-      "$ref": "#/definitions/reason-specs",
-      "description": "ReScript comes with [Reason](http://reasonml.github.io/) by default. Specific configurations here."
-    },
     "gentypeconfig": {
       "$ref": "#/definitions/gentype-specs",
       "description": "gentype config, see cristianoc/genType for more details"
@@ -458,7 +441,7 @@
     },
     "ppx-flags": {
       "$ref": "#/definitions/ppx-specs",
-      "description": "PPX macros to pass to compiler. The syntax is package_name/binary, for example: `reason/reactjs_jsx_ppx_3.native`. Currenly searches in `node_modules`"
+      "description": "PPX macros to pass to compiler. The syntax is package_name/binary, for example: `rescript-relay/ppx`. Currenly searches in `node_modules`"
     },
     "pp-flags": {
       "$ref": "#/definitions/pp-specs",

jscomp/bsb/bsb_build_schemas.ml

@@ -52,7 +52,6 @@ let jsx = "jsx"
 let jsx_version = "version"
 let jsx_module = "module"
 let jsx_mode = "mode"
-let jsx_v3_dependencies = "v3-dependencies"
 let cut_generators = "cut-generators"
 let generators = "generators"
 let command = "command"

jscomp/bsb/bsb_config_parse.ml

@@ -103,26 +103,6 @@ let extract_boolean (map : json_map) (field : string) (default : bool) : bool =
   | Some config ->
       Bsb_exception.config_error config (field ^ " expect a boolean")
 
-let extract_reason_react_jsx (map : json_map) =
-  let default : Bsb_config_types.reason_react_jsx option ref = ref None in
-  map
-  |? ( Bsb_build_schemas.reason,
-       `Obj
-         (fun m ->
-           match m.?(Bsb_build_schemas.react_jsx) with
-           | Some (Flo { loc; flo }) -> (
-               match flo with
-               | "3" -> default := Some Jsx_v3
-               | _ -> Bsb_exception.errorf ~loc "Unsupported jsx version %s" flo
-               )
-           | Some x ->
-               Bsb_exception.config_error x
-                 "Unexpected input (expect a version number) for jsx, note \
-                  boolean is no longer allowed"
-           | None -> ()) )
-  |> ignore;
-  !default
-
 let extract_warning (map : json_map) =
   match map.?(Bsb_build_schemas.warnings) with
   | None -> Bsb_warning.use_default
@@ -262,7 +242,6 @@ let interpret_json
                    ~desc:Bsb_build_schemas.pp_flags p)
                   .path)
       in
-      let reason_react_jsx = extract_reason_react_jsx map in
       let bs_dependencies =
         extract_dependencies map per_proj_dir Bsb_build_schemas.bs_dependencies
       in
@@ -287,15 +266,6 @@ let interpret_json
           in
           let bsc_flags = extract_string_list map Bsb_build_schemas.bsc_flags in
           let jsx = Bsb_jsx.from_map map in
-          let jsx, bsc_flags =
-            match package_kind with
-            | Pinned_dependency x | Dependency x ->
-                if List.mem package_name x.jsx.v3_dependencies then
-                  ( { jsx with version = Some Jsx_v3 },
-                    "-open ReactV3" :: bsc_flags )
-                else (x.jsx, bsc_flags)
-            | _ -> (jsx, bsc_flags)
-          in
           {
             pinned_dependencies;
             gentype_config;
@@ -326,7 +296,6 @@ let interpret_json
               | Pinned_dependency x | Dependency x -> x.package_specs);
             file_groups = groups;
             files_to_install = Queue.create ();
-            reason_react_jsx;
             jsx;
             generators = extract_generators map;
             cut_generators;

jscomp/bsb/bsb_config_types.ml

@@ -28,8 +28,6 @@ type dependency = {
 }
 
 type dependencies = dependency list
-type reason_react_jsx = Jsx_v3
-(* string option  *)
 
 type gentype_config = bool
 type command = string
@@ -56,7 +54,6 @@ type t = {
   package_specs : Bsb_package_specs.t;
   file_groups : Bsb_file_groups.t;
   files_to_install : Bsb_db.module_info Queue.t;
-  reason_react_jsx : reason_react_jsx option;
   jsx: Bsb_jsx.t;
   (* whether apply PPX transform or not*)
   generators : command Map_string.t;

jscomp/bsb/bsb_jsx.ml

@@ -1,4 +1,4 @@
-type version = Jsx_v3 | Jsx_v4
+type version = Jsx_v4
 type module_ = React | Generic of {moduleName: string}
 type mode = Classic | Automatic
 type dependencies = string list
@@ -7,13 +7,11 @@ type t = {
   version : version option;
   module_ : module_ option;
   mode : mode option;
-  v3_dependencies : dependencies;
 }
 
 let encode_no_nl jsx =
   (match jsx.version with
   | None -> ""
-  | Some Jsx_v3 -> "3"
   | Some Jsx_v4 -> "4")
   ^ (match jsx.module_ with None -> "" | Some React -> "React" | Some Generic {moduleName} -> moduleName)
   ^
@@ -35,15 +33,13 @@ 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 v3_dependencies : dependencies ref = ref [] in
   map
   |? ( Bsb_build_schemas.jsx,
        `Obj
          (fun m ->
            match m.?(Bsb_build_schemas.jsx_version) with
            | Some (Flo { loc; flo }) -> (
                match flo with
-               | "3" -> version := Some Jsx_v3
                | "4" -> version := Some Jsx_v4
                | _ -> Bsb_exception.errorf ~loc "Unsupported jsx version %s" flo
                )
@@ -76,20 +72,9 @@ let from_map map =
                Bsb_exception.config_error x
                  "Unexpected input (expect classic or automatic) for jsx mode"
            | None -> ()) )
-  |? ( Bsb_build_schemas.jsx,
-       `Obj
-         (fun m ->
-           match m.?(Bsb_build_schemas.jsx_v3_dependencies) with
-           | Some (Arr { content }) ->
-            v3_dependencies := get_list_string content
-           | Some x ->
-               Bsb_exception.config_error x
-                 "Unexpected input for jsx v3-dependencies"
-           | None -> ()) )
   |> ignore;
   {
     version = !version;
     module_ = !module_;
     mode = !mode;
-    v3_dependencies = !v3_dependencies;
   }

jscomp/bsb/bsb_ninja_gen.ml

@@ -148,7 +148,6 @@ let output_ninja_and_namespace_map ~per_proj_dir ~package_kind
        package_specs;
        file_groups = { files = bs_file_groups };
        files_to_install;
-       reason_react_jsx;
        jsx;
        generators;
        namespace;
@@ -195,8 +194,8 @@ let output_ninja_and_namespace_map ~per_proj_dir ~package_kind
   in
   let rules : Bsb_ninja_rule.builtin =
     Bsb_ninja_rule.make_custom_rules ~gentype_config
-      ~has_postbuild:js_post_build_cmd ~pp_file
-      ~reason_react_jsx ~jsx ~package_specs ~namespace ~digest ~package_name
+      ~has_postbuild:js_post_build_cmd ~pp_file ~jsx
+      ~package_specs ~namespace ~digest ~package_name
       ~warnings ~ppx_files ~bsc_flags ~dpkg_incls (* dev dependencies *)
       ~lib_incls (* its own libs *)
       ~dev_incls (* its own devs *)

jscomp/bsb/bsb_ninja_rule.ml

@@ -88,7 +88,6 @@ type builtin = {
 
 let make_custom_rules ~(gentype_config : Bsb_config_types.gentype_config)
     ~(has_postbuild : string option) ~(pp_file : string option)
-    ~(reason_react_jsx : Bsb_config_types.reason_react_jsx option)
     ~(jsx : Bsb_jsx.t) ~(digest : string) ~(package_specs : Bsb_package_specs.t)
     ~(namespace : string option) ~package_name ~warnings
     ~(ppx_files : Bsb_config_types.ppx list) ~bsc_flags ~(dpkg_incls : string)
@@ -156,11 +155,9 @@ let make_custom_rules ~(gentype_config : Bsb_config_types.gentype_config)
     | None -> ()
     | Some flag ->
         Ext_buffer.add_char_string buf ' ' (Bsb_build_util.pp_flag flag));
-    (match (reason_react_jsx, jsx.version) with
-    | _, Some Jsx_v3 -> Ext_buffer.add_string buf " -bs-jsx 3"
-    | _, Some Jsx_v4 -> Ext_buffer.add_string buf " -bs-jsx 4"
-    | Some Jsx_v3, None -> Ext_buffer.add_string buf " -bs-jsx 3"
-    | None, None -> ());
+    (match (jsx.version) with
+    | Some Jsx_v4 -> Ext_buffer.add_string buf " -bs-jsx 4"
+    | None -> ());
     (match jsx.module_ with
     | None -> ()
     | Some React -> Ext_buffer.add_string buf " -bs-jsx-module react"

jscomp/bsb/bsb_ninja_rule.mli

@@ -68,7 +68,6 @@ val make_custom_rules :
   gentype_config:Bsb_config_types.gentype_config ->
   has_postbuild:string option ->
   pp_file:string option ->
-  reason_react_jsx:Bsb_config_types.reason_react_jsx option ->
   jsx:Bsb_jsx.t ->
   digest:string ->
   package_specs:Bsb_package_specs.t ->

jscomp/common/js_config.ml

@@ -24,7 +24,7 @@
 
 (** Browser is not set via command line only for internal use *)
 
-type jsx_version = Jsx_v3 | Jsx_v4
+type jsx_version = Jsx_v4
 type jsx_module = React | Generic of {module_name: string}
 type jsx_mode = Classic | Automatic
 
@@ -59,7 +59,6 @@ let no_export = ref false
 let as_ppx = ref false
 
 let int_of_jsx_version = function
-  | Jsx_v3 -> 3
   | Jsx_v4 -> 4
 
 let string_of_jsx_module = function
@@ -71,7 +70,6 @@ let string_of_jsx_mode = function
   | Automatic -> "automatic"
 
 let jsx_version_of_int = function
-  | 3 -> Some Jsx_v3
   | 4 -> Some Jsx_v4
   | _ -> None
 

jscomp/common/js_config.mli

@@ -22,7 +22,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *)
 
-type jsx_version = Jsx_v3 | Jsx_v4
+type jsx_version = Jsx_v4
 type jsx_module = React | Generic of {module_name: string}
 type jsx_mode = Classic | Automatic
 

jscomp/gentype/TranslateTypeExprFromTypes.ml

@@ -151,8 +151,7 @@ let translate_constr ~config ~params_translation ~(path : Path.t) ~type_env =
         param_translation1.dependencies @ param_translation2.dependencies;
       type_ = variant;
     }
-  | ( (["React"; "callback"] | ["ReactV3"; "React"; "callback"]),
-      [from_translation; to_translation] ) ->
+  | ["React"; "callback"], [from_translation; to_translation] ->
     {
       dependencies = from_translation.dependencies @ to_translation.dependencies;
       type_ =
@@ -163,8 +162,7 @@ let translate_constr ~config ~params_translation ~(path : Path.t) ~type_env =
             type_vars = [];
           };
     }
-  | ( (["React"; "componentLike"] | ["ReactV3"; "React"; "componentLike"]),
-      [props_translation; ret_translation] ) ->
+  | ["React"; "componentLike"], [props_translation; ret_translation] ->
     {
       dependencies =
         props_translation.dependencies @ ret_translation.dependencies;
@@ -176,8 +174,7 @@ let translate_constr ~config ~params_translation ~(path : Path.t) ~type_env =
             type_vars = [];
           };
     }
-  | ( (["React"; "component"] | ["ReactV3"; "React"; "component"]),
-      [props_translation] ) ->
+  | ["React"; "component"], [props_translation] ->
     {
       dependencies = props_translation.dependencies;
       type_ =
@@ -188,17 +185,12 @@ let translate_constr ~config ~params_translation ~(path : Path.t) ~type_env =
             type_vars = [];
           };
     }
-  | ( (["React"; "Context"; "t"] | ["ReactV3"; "React"; "Context"; "t"]),
-      [param_translation] ) ->
+  | ["React"; "Context"; "t"], [param_translation] ->
     {
       dependencies = param_translation.dependencies;
       type_ = EmitType.type_react_context ~type_:param_translation.type_;
     }
-  | ( ( ["React"; "Ref"; "t"]
-      | ["React"; "ref"]
-      | ["ReactV3"; "React"; "Ref"; "t"]
-      | ["ReactV3"; "React"; "ref"] ),
-      [param_translation] ) ->
+  | (["React"; "Ref"; "t"] | ["React"; "ref"]), [param_translation] ->
     {
       dependencies = param_translation.dependencies;
       type_ = EmitType.type_react_ref ~type_:param_translation.type_;
@@ -214,7 +206,6 @@ let translate_constr ~config ~params_translation ~(path : Path.t) ~type_env =
   | ["ReactEvent"; "Mouse"; "t"], [] ->
     {dependencies = []; type_ = EmitType.type_react_event_mouse_t}
   | ( ( ["React"; "element"]
-      | ["ReactV3"; "React"; "element"]
       | ["ReasonReact"; "reactElement"]
       | ["Pervasives"; "Jsx"; "element"] ),
       [] ) ->

jscomp/syntax/src/jsx_ppx.ml

@@ -72,12 +72,6 @@ let process_config_attribute attribute config =
   if is_jsx_config_attr attribute then update_config config (snd attribute)
 
 let get_mapper ~config =
-  let ( expr3,
-        module_binding3,
-        transform_signature_item3,
-        transform_structure_item3 ) =
-    Reactjs_jsx_v3.jsx_mapper ~config
-  in
   let ( expr4,
         module_binding4,
         transform_signature_item4,
@@ -87,13 +81,11 @@ let get_mapper ~config =
 
   let expr mapper e =
     match config.version with
-    | 3 -> expr3 mapper e
     | 4 -> expr4 mapper e
     | _ -> default_mapper.expr mapper e
   in
   let module_binding mapper mb =
     match config.version with
-    | 3 -> module_binding3 mapper mb
     | 4 -> module_binding4 mapper mb
     | _ -> default_mapper.module_binding mapper mb
   in
@@ -122,9 +114,7 @@ let get_mapper ~config =
           | Psig_attribute attr -> process_config_attribute attr config
           | _ -> ());
           let item = default_mapper.signature_item mapper item in
-          if config.version = 3 then transform_signature_item3 item
-          else if config.version = 4 then transform_signature_item4 item
-          else [item])
+          if config.version = 4 then transform_signature_item4 item else [item])
         items
       |> List.flatten
     in
@@ -141,9 +131,7 @@ let get_mapper ~config =
           | Pstr_attribute attr -> process_config_attribute attr config
           | _ -> ());
           let item = default_mapper.structure_item mapper item in
-          if config.version = 3 then transform_structure_item3 item
-          else if config.version = 4 then transform_structure_item4 item
-          else [item])
+          if config.version = 4 then transform_structure_item4 item else [item])
         items
       |> List.flatten
     in