Update bsb and run tests

Author: nojaf

compiler/bsb/bsb_build_schemas.ml

@@ -51,7 +51,6 @@ let react_jsx = "react-jsx"
 let jsx = "jsx"
 let jsx_version = "version"
 let jsx_module = "module"
-let jsx_mode = "mode"
 let cut_generators = "cut-generators"
 let generators = "generators"
 let command = "command"

compiler/bsb/bsb_jsx.ml

@@ -1,23 +1,18 @@
 type version = Jsx_v4
 type module_ = React | Generic of {moduleName: string}
-type mode = Classic | Automatic
 type dependencies = string list
 
-type t = {version: version option; module_: module_ option; mode: mode option}
+type t = {version: version option; module_: module_ option}
 
 let encode_no_nl jsx =
   (match jsx.version with
   | None -> ""
   | Some Jsx_v4 -> "4")
-  ^ (match jsx.module_ with
-    | None -> ""
-    | Some React -> "React"
-    | Some (Generic {moduleName}) -> moduleName)
   ^
-  match jsx.mode with
+  match jsx.module_ with
   | None -> ""
-  | Some Classic -> "Classic"
-  | Some Automatic -> "Automatic"
+  | Some React -> "React"
+  | Some (Generic {moduleName}) -> moduleName
 
 let ( .?() ) = Map_string.find_opt
 let ( |? ) m (key, cb) = m |> Ext_json.test key cb
@@ -33,7 +28,6 @@ let get_list_string s = get_list_string_acc s []
 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
   map
   |? ( Bsb_build_schemas.jsx,
        `Obj
@@ -59,18 +53,5 @@ let from_map map =
              Bsb_exception.config_error x
                "Unexpected input (jsx module name) for jsx module"
            | None -> ()) )
-  |? ( Bsb_build_schemas.jsx,
-       `Obj
-         (fun m ->
-           match m.?(Bsb_build_schemas.jsx_mode) with
-           | Some (Str {loc; str}) -> (
-             match str with
-             | "classic" -> mode := Some Classic
-             | "automatic" -> mode := Some Automatic
-             | _ -> Bsb_exception.errorf ~loc "Unsupported jsx mode %s" str)
-           | Some x ->
-             Bsb_exception.config_error x
-               "Unexpected input (expect classic or automatic) for jsx mode"
-           | None -> ()) )
   |> ignore;
-  {version = !version; module_ = !module_; mode = !mode}
+  {version = !version; module_ = !module_}

compiler/bsb/bsb_ninja_rule.ml

@@ -167,10 +167,6 @@ let make_custom_rules ~(gentype_config : Bsb_config_types.gentype_config)
     | Some React -> Ext_buffer.add_string buf " -bs-jsx-module react"
     | Some (Generic {moduleName}) ->
       Ext_buffer.add_string buf (" -bs-jsx-module " ^ moduleName));
-    (match jsx.mode with
-    | None -> ()
-    | Some Classic -> Ext_buffer.add_string buf " -bs-jsx-mode classic"
-    | Some Automatic -> Ext_buffer.add_string buf " -bs-jsx-mode automatic");
 
     Ext_buffer.add_char_string buf ' ' bsc_flags;
     Ext_buffer.add_string buf " -absname -bs-ast -o $out $i";

lib/es6/JsxPPXReactSupport.js

@@ -12,7 +12,7 @@ const fixtures = fs
   .filter(fileName => path.extname(fileName) === ".res");
 
 // const runtime = path.join(__dirname, '..', '..', 'runtime')
-const prefix = `${bsc} -w +A -bs-jsx 4 -bs-jsx-mode automatic`;
+const prefix = `${bsc} -w +A -bs-jsx 4`;
 
 const updateTests = process.argv[2] === "update";