Skip to content

Sync latest syntax. #5575

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
merged 2 commits into from
Jul 21, 2022
Merged

Sync latest syntax. #5575

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2a01ece
Sync latest syntax.
cristianoc Jul 21, 2022
60dc678
Hook up V3 jsx.
cristianoc Jul 21, 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
8 changes: 6 additions & 2 deletions jscomp/frontend/ppx_entry.ml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,9 @@ let rewrite_signature (ast : Parsetree.signature) : Parsetree.signature =
Ast_config.iter_on_bs_config_sigi ast;
let ast =
match !Js_config.jsx_version with
| 3 -> Reactjs_jsx_ppx_v3.rewrite_signature ast
| 3 ->
Reactjs_jsx_ppx.rewrite_signature ~jsxVersion:3 ~jsxModule:""
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It might be duplicated to #5484

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I want to merge this in master.
Then #5484 rebases on top.
A small step, but gets the basic structure into master.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Got your point!

~jsxMode:"" ast
| _ -> ast
(* react-jsx ppx relies on built-in ones like `##` *)
in
Expand All @@ -45,7 +47,9 @@ let rewrite_implementation (ast : Parsetree.structure) : Parsetree.structure =
Ast_config.iter_on_bs_config_stru ast;
let ast =
match !Js_config.jsx_version with
| 3 -> Reactjs_jsx_ppx_v3.rewrite_implementation ast
| 3 ->
Reactjs_jsx_ppx.rewrite_implementation ~jsxVersion:3 ~jsxModule:""
~jsxMode:"" ast
| _ -> ast
in
if !Js_config.no_builtin_ppx then ast
Expand Down
Loading