Skip to content

Conversation

@rickyvetter
Copy link
Contributor

This adds a fix for 4.06 compilation of @react.component tags which would provide inconsistent return types. Also adds a test to prevent this functionality from breaking in 4.06 or 02 going forward.

Fixes 3519 round 2.

Main change is in the second commit. The first commit is a set of unrelated changes that came up when I built 4.06. Happy to delete that commit entirely if it makes things easier.

| Oval_string (s,_,_) ->
#else
| Oval_string s ->
| Oval_string (s,_,_) ->
Copy link
Member

Choose a reason for hiding this comment

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

curious why this change is needed to make 4.06 build, should not it go from the first #if

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I'm not sure. My workflow is a little different from the recommended in CONTIBUTING.md - it's something like:

git pull
cd ocaml
git checkout 4.06.1+BS && git pull
cd ..
ninja -C jscomp -t clean
ninja -C jscomp # this command fails if I don't change to the three
yarn postinstall

@bobzhang
Copy link
Member

bobzhang commented Jul 4, 2019

see my comments about commit #1, can we only get commit #2
In the future, is it possible to get rid of the use of REACT_JS_JSX_V2, I noticed it is just used twice which could be parametrized instead of conditional compilation?

@bobzhang bobzhang merged commit 7134301 into rescript-lang:master Jul 7, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants