Skip to content

Wire to JSX PPX V4 and introduce Jsx* modules #5484

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
cristianoc merged 11 commits into from
Jul 21, 2022
Merged

Wire to JSX PPX V4 and introduce Jsx* modules #5484

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
0095877
add new configuration for jsx ppx v4
mununki Jun 27, 2022
1d677f7
add Jsx
mununki Jul 2, 2022
ec99071
add JsxEvent
mununki Jul 3, 2022
311a4f1
change bulid schema for bsconfig.json
mununki Jul 3, 2022
33749df
fix lib rebuild fail
mununki Jul 4, 2022
1b638b8
fix Js_config input error
mununki Jul 8, 2022
8613328
clean up unused pattern, sync jsx ppx interface
mununki Jul 9, 2022
e66ec03
clean up extract jsx in bsb config
mununki Jul 13, 2022
bdd64b1
parse jsx config to variants
mununki Jul 14, 2022
3e4a68c
change Js_config.jsx_version variant
mununki Jul 14, 2022
6576b6e
Update artifacts.txt
cristianoc Jul 19, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
clean up extract jsx in bsb config
  • Loading branch information
@mununki
mununki committed Jul 21, 2022
commit e66ec039c5260368b8479511085f0b84f107fac7
34 changes: 11 additions & 23 deletions jscomp/bsb/bsb_config_parse.ml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,62 +130,52 @@ let extract_reason_react_jsx (map : json_map) =
|> ignore;
!default

let extract_jsx_version (map : json_map) =
let default : Bsb_config_types.jsx_version option ref = ref None in
let extract_jsx (map : json_map) =
let version : Bsb_config_types.jsx_version option ref = ref None in
let module_ : Bsb_config_types.jsx_module option ref = ref None in
let mode : Bsb_config_types.jsx_mode option ref = ref None 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" -> default := Some Jsx_v3
| "4" -> default := Some Jsx_v4
| "3" -> version := Some Jsx_v3
| "4" -> version := Some Jsx_v4
| _ -> Bsb_exception.errorf ~loc "Unsupported jsx-version %s" flo
)
| Some x ->
Bsb_exception.config_error x
"Unexpected input (expect a version number) for jsx-version"
| None -> ()) )
|> ignore;
!default

let extract_jsx_module (map : json_map) =
let default : Bsb_config_types.jsx_module option ref = ref None in
map
|? ( Bsb_build_schemas.jsx,
`Obj
(fun m ->
match m.?(Bsb_build_schemas.jsx_module) with
| Some (Str { loc; str }) -> (
match str with
| "react" -> default := Some React
| "react" -> module_ := Some React
| _ -> Bsb_exception.errorf ~loc "Unsupported jsx-module %s" str)
| Some x ->
Bsb_exception.config_error x
"Unexpected input (jsx module name) for jsx-mode"
| None -> ()) )
|> ignore;
!default

let extract_jsx_mode (map : json_map) =
let default : Bsb_config_types.jsx_mode option ref = ref None in
map
|? ( Bsb_build_schemas.jsx,
`Obj
(fun m ->
match m.?(Bsb_build_schemas.jsx_mode) with
| Some (Str { loc; str }) -> (
match str with
| "classic" -> default := Some Classic
| "automatic" -> default := Some Automatic
| "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;
!default
(!version, !module_, !mode)

let extract_warning (map : json_map) =
match map.?(Bsb_build_schemas.warnings) with
Expand Down Expand Up @@ -334,9 +324,7 @@ let interpret_json ~(package_kind : Bsb_package_kind.t) ~(per_proj_dir : string)
.path)
in
let reason_react_jsx = extract_reason_react_jsx map in
let jsx_version = extract_jsx_version map in
let jsx_module = extract_jsx_module map in
let jsx_mode = extract_jsx_mode map in
let jsx_version, jsx_module, jsx_mode = extract_jsx map in
let bs_dependencies =
extract_dependencies map per_proj_dir Bsb_build_schemas.bs_dependencies
in
Expand Down
34 changes: 11 additions & 23 deletions lib/4.06.1/rescript.ml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10373,62 +10373,52 @@ let extract_reason_react_jsx (map : json_map) =
|> ignore;
!default

let extract_jsx_version (map : json_map) =
let default : Bsb_config_types.jsx_version option ref = ref None in
let extract_jsx (map : json_map) =
let version : Bsb_config_types.jsx_version option ref = ref None in
let module_ : Bsb_config_types.jsx_module option ref = ref None in
let mode : Bsb_config_types.jsx_mode option ref = ref None 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" -> default := Some Jsx_v3
| "4" -> default := Some Jsx_v4
| "3" -> version := Some Jsx_v3
| "4" -> version := Some Jsx_v4
| _ -> Bsb_exception.errorf ~loc "Unsupported jsx-version %s" flo
)
| Some x ->
Bsb_exception.config_error x
"Unexpected input (expect a version number) for jsx-version"
| None -> ()) )
|> ignore;
!default

let extract_jsx_module (map : json_map) =
let default : Bsb_config_types.jsx_module option ref = ref None in
map
|? ( Bsb_build_schemas.jsx,
`Obj
(fun m ->
match m.?(Bsb_build_schemas.jsx_module) with
| Some (Str { loc; str }) -> (
match str with
| "react" -> default := Some React
| "react" -> module_ := Some React
| _ -> Bsb_exception.errorf ~loc "Unsupported jsx-module %s" str)
| Some x ->
Bsb_exception.config_error x
"Unexpected input (jsx module name) for jsx-mode"
| None -> ()) )
|> ignore;
!default

let extract_jsx_mode (map : json_map) =
let default : Bsb_config_types.jsx_mode option ref = ref None in
map
|? ( Bsb_build_schemas.jsx,
`Obj
(fun m ->
match m.?(Bsb_build_schemas.jsx_mode) with
| Some (Str { loc; str }) -> (
match str with
| "classic" -> default := Some Classic
| "automatic" -> default := Some Automatic
| "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;
!default
(!version, !module_, !mode)

let extract_warning (map : json_map) =
match map.?(Bsb_build_schemas.warnings) with
Expand Down Expand Up @@ -10577,9 +10567,7 @@ let interpret_json ~(package_kind : Bsb_package_kind.t) ~(per_proj_dir : string)
.path)
in
let reason_react_jsx = extract_reason_react_jsx map in
let jsx_version = extract_jsx_version map in
let jsx_module = extract_jsx_module map in
let jsx_mode = extract_jsx_mode map in
let jsx_version, jsx_module, jsx_mode = extract_jsx map in
let bs_dependencies =
extract_dependencies map per_proj_dir Bsb_build_schemas.bs_dependencies
in
Expand Down