Merge pull request #3452 from rickyvetter/jsxppx

Add new React function component jsx ppx
rescript-lang · Mar 28, 2019 · cf06fd3 · cf06fd3
2 parents d07b76f + 4e65817
commit cf06fd3
Show file tree

Hide file tree

Showing 11 changed files with 3,798 additions and 51 deletions.
diff --git a/jscomp/bsb/bsb_config_parse.ml b/jscomp/bsb/bsb_config_parse.ml
@@ -281,7 +281,9 @@ let interpret_json
                 Some (Filename.quote 
                         (Filename.concat bsc_dir Literals.reactjs_jsx_ppx_2_exe) )
             | "3" -> 
-              Bsb_exception.errorf ~loc "JSX version 3 is deprecated, please downgrade to 1.x for version 3"
+              reason_react_jsx := 
+                Some (Filename.quote 
+                        (Filename.concat bsc_dir Literals.reactjs_jsx_ppx_3_exe) )
             | _ -> Bsb_exception.errorf ~loc "Unsupported jsx version %s" flo
           end        
         | Some x -> Bsb_exception.config_error x 

diff --git a/lib/4.02.3/bsb.ml b/lib/4.02.3/bsb.ml
@@ -11878,7 +11878,9 @@ let interpret_json
                 Some (Filename.quote 
                         (Filename.concat bsc_dir Literals.reactjs_jsx_ppx_2_exe) )
             | "3" -> 
-              Bsb_exception.errorf ~loc "JSX version 3 is deprecated, please downgrade to 1.x for version 3"
+              reason_react_jsx := 
+                Some (Filename.quote 
+                        (Filename.concat bsc_dir Literals.reactjs_jsx_ppx_3_exe) )
             | _ -> Bsb_exception.errorf ~loc "Unsupported jsx version %s" flo
           end        
         | Some x -> Bsb_exception.config_error x 

diff --git a/lib/4.02.3/reactjs_jsx_ppx_v2.ml b/lib/4.02.3/reactjs_jsx_ppx_v2.ml