remove jsx v2

Author: bobzhang

jscomp/main/js_main.ml

@@ -180,7 +180,9 @@ let buckle_script_flags : (string * Arg.spec * string) list =
   )
   ::
   ("-bs-jsx",
-    Arg.Int (fun i -> Js_config.jsx_version := i),
+    Arg.Int (fun i -> 
+      (if i <> 3 then raise (Arg.Bad (" Not supported jsx version : " ^ string_of_int i)));
+      Js_config.jsx_version := i),
     " Set jsx version"
   )
   :: 

jscomp/syntax/ppx_entry.ml

@@ -29,7 +29,6 @@ let rewrite_signature (ast : Parsetree.signature) : Parsetree.signature =
   Ast_config.iter_on_bs_config_sigi ast; 
   let ast = 
     match !Js_config.jsx_version with
-    | 2 -> Reactjs_jsx_ppx_v2.rewrite_signature ast 
     | 3 -> Reactjs_jsx_ppx_v3.rewrite_signature ast 
     | _ -> ast 
     (* react-jsx ppx relies on built-in ones like `##` *)
@@ -48,8 +47,7 @@ let rewrite_implementation (ast : Parsetree.structure) : Parsetree.structure =
   Bs_ast_invariant.iter_warnings_on_stru ast ;   
   Ast_config.iter_on_bs_config_stru ast ;   
   let ast = 
-    match !Js_config.jsx_version with 
-    | 2 -> Reactjs_jsx_ppx_v2.rewrite_implementation ast 
+    match !Js_config.jsx_version with     
     | 3 -> Reactjs_jsx_ppx_v3.rewrite_implementation ast 
     | _ -> ast 
   in 

jscomp/syntax/reactjs_jsx_ppx.cppo.ml

@@ -932,13 +932,8 @@ let jsxMapper () =
         (* Foo.createElement(~prop1=foo, ~prop2=bar, ~children=[], ()) *)
         | {loc; txt = Ldot (modulePath, ("createElement" | "make"))} ->
           (match !jsxVersion with
-#ifdef REACT_JS_JSX_V2
-          | None
-          | Some 2 -> transformUppercaseCall modulePath mapper loc attrs callExpression callArguments
-#else
           | Some 2 -> transformUppercaseCall modulePath mapper loc attrs callExpression callArguments
           | None
-#endif
           | Some 3 -> transformUppercaseCall3 modulePath mapper loc attrs callExpression callArguments
           | Some _ -> raise (Invalid_argument "JSX: the JSX version must be 2 or 3"))
 
@@ -947,13 +942,8 @@ let jsxMapper () =
           ReactDOMRe.createElement(~props=ReactDOMRe.props(~props1=foo, ~props2=bar, ()), [|bla|]) *)
         | {loc; txt = Lident id} ->
           (match !jsxVersion with
-#ifdef REACT_JS_JSX_V2
-          | None
-          | Some 2 -> transformLowercaseCall mapper loc attrs callArguments id
-#else
           | Some 2 -> transformLowercaseCall mapper loc attrs callArguments id
           | None
-#endif
           | Some 3 -> transformLowercaseCall3 mapper loc attrs callArguments id
           | Some _ -> raise (Invalid_argument "JSX: the JSX version must be 2 or 3"))