Skip to content

Commit ef7e8a9

Browse files
committed
remove deprecated Jsx_v2
1 parent bb53c0b commit ef7e8a9

File tree

4 files changed

+1
-6
lines changed

4 files changed

+1
-6
lines changed

jscomp/bsb/bsb_config_parse.ml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -261,8 +261,6 @@ let extract_reason_react_jsx (map : json_map) =
261261
match Map_string.find_opt m Bsb_build_schemas.react_jsx with
262262
| Some (Flo{loc; flo}) ->
263263
begin match flo with
264-
| "2" ->
265-
default := Some Jsx_v2
266264
| "3" ->
267265
default := Some Jsx_v3
268266
| _ -> Bsb_exception.errorf ~loc "Unsupported jsx version %s" flo

jscomp/bsb/bsb_config_types.ml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,6 @@ type entries_t = JsTarget of string | NativeTarget of string | BytecodeTarget of
3636
type compilation_kind_t = Js | Bytecode | Native
3737

3838
type reason_react_jsx =
39-
| Jsx_v2
4039
| Jsx_v3
4140
(* string option *)
4241

jscomp/bsb/bsb_merlin_gen.ml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -156,7 +156,7 @@ let merlin_file_gen ~per_proj_dir:(per_proj_dir:string)
156156
else "'%s -as-ppx -bs-jsx %d'"
157157
in
158158
Printf.sprintf fmt Bsb_global_paths.vendor_bsc
159-
(match opt with Jsx_v2 -> 2 | Jsx_v3 -> 3)
159+
(match opt with Jsx_v3 -> 3)
160160
)
161161
);
162162
Ext_list.iter external_includes (fun path ->

jscomp/bsb/bsb_ninja_rule.ml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -163,8 +163,6 @@ let make_custom_rules
163163
(match has_reason_react_jsx, reason_react_jsx with
164164
| false, _
165165
| _, None -> ()
166-
| _, Some Jsx_v2
167-
-> Ext_buffer.add_string buf " -bs-jsx 2"
168166
| _, Some Jsx_v3
169167
-> Ext_buffer.add_string buf " -bs-jsx 3"
170168
);

0 commit comments

Comments
 (0)