Skip to content

Commit 4c97eec

Browse files
authored
Merge pull request rescript-lang#6735 from cknitt/11-to-master
Merge changes from 11.0_release into master
2 parents ce0aa8d + 4afdd83 commit 4c97eec

File tree

5 files changed

+7
-8
lines changed

5 files changed

+7
-8
lines changed

CHANGELOG.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,12 @@
2727

2828
- Make the `--help` arg be prioritized in the CLI, so correctly prints help message and skip other commands. https://github.com/rescript-lang/rescript-compiler/pull/6667
2929

30+
# 11.1.0
31+
32+
#### :bug: Bug Fix
33+
34+
- Revert escape JSX prop names with hyphens (#6705). https://github.com/rescript-lang/rescript-compiler/pull/6731
35+
3036
# 11.1.0-rc.8
3137

3238
#### :rocket: New Feature

jscomp/syntax/src/res_printer.ml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4367,7 +4367,6 @@ and printJsxProps ~state args cmtTbl : Doc.t * Parsetree.expression option =
43674367
loop [] args
43684368

43694369
and printJsxProp ~state arg cmtTbl =
4370-
let printIdentLike ident = printIdentLike ~allowHyphen:true ident in
43714370
match arg with
43724371
| ( ((Asttypes.Labelled lblTxt | Optional lblTxt) as lbl),
43734372
{

jscomp/syntax/tests/printer/expr/expected/exoticIdent.res.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ assert(\"let")
6060
let x = 1
6161

6262
let x =
63-
<div aria-foo=\"type">
63+
<div \"aria-foo"=\"type">
6464
\"module"
6565
\"let"
6666
</div>

jscomp/syntax/tests/printer/expr/expected/jsx.res.txt

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -47,11 +47,6 @@ let x =
4747
{a}
4848
<B />
4949
</Foo.custom-tag>
50-
let x =
51-
<custom-tag data-custom-state=true>
52-
{a}
53-
<B />
54-
</custom-tag>
5550

5651
let x = <div className="container" className2="container2" className3="container3" onClick />
5752

jscomp/syntax/tests/printer/expr/jsx.res

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@ let x = <A> {a} </A>
1717
let x = <A> {a} {b} </A>
1818
let x = <custom-tag className="container" > {a} <B/> </custom-tag>
1919
let x = <Foo.custom-tag className="container" > {a} <B/> </Foo.custom-tag>
20-
let x = <custom-tag data-custom-state=true > {a} <B/> </custom-tag>
2120

2221
let x =
2322
<div

0 commit comments

Comments
 (0)