From 73e68a67febd0e129904a266c568b7bebd8889b2 Mon Sep 17 00:00:00 2001 From: Christoph Knittel Date: Wed, 17 Apr 2024 14:05:54 +0200 Subject: [PATCH 1/3] Set version to 11.1.0-rc.9 (#6727) --- CHANGELOG.md | 2 ++ jscomp/common/bs_version.ml | 2 +- package-lock.json | 4 ++-- package.json | 2 +- packages/std/package.json | 2 +- 5 files changed, 7 insertions(+), 5 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 96a9675c60..2ccaf4bd3e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -10,6 +10,8 @@ > - :house: [Internal] > - :nail_care: [Polish] +# 11.1.0-rc.9 (Unreleased) + # 11.1.0-rc.8 #### :rocket: New Feature diff --git a/jscomp/common/bs_version.ml b/jscomp/common/bs_version.ml index dda692360d..be5ed45a82 100644 --- a/jscomp/common/bs_version.ml +++ b/jscomp/common/bs_version.ml @@ -21,6 +21,6 @@ * You should have received a copy of the GNU Lesser General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *) -let version = "11.1.0-rc.8" +let version = "11.1.0-rc.9" let header = "// Generated by ReScript, PLEASE EDIT WITH CARE" let package_name = ref "rescript" diff --git a/package-lock.json b/package-lock.json index 9dfdd2bab8..149c42c3fe 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "rescript", - "version": "11.1.0-rc.8", + "version": "11.1.0-rc.9", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "rescript", - "version": "11.1.0-rc.8", + "version": "11.1.0-rc.9", "hasInstallScript": true, "license": "SEE LICENSE IN LICENSE", "bin": { diff --git a/package.json b/package.json index ea7e48dc95..206bfc2cbd 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "rescript", - "version": "11.1.0-rc.8", + "version": "11.1.0-rc.9", "devDependencies": { "mocha": "10.1.0", "nyc": "15.0.0", diff --git a/packages/std/package.json b/packages/std/package.json index 100422033b..0ac0ce407e 100644 --- a/packages/std/package.json +++ b/packages/std/package.json @@ -1,6 +1,6 @@ { "name": "@rescript/std", - "version": "11.1.0-rc.8", + "version": "11.1.0-rc.9", "keywords": [ "rescript", "stdlib", From 2ebff685281aa9d329ad82b7f5763cfd7109b28f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Paul=20Tsnobiladz=C3=A9?= Date: Thu, 18 Apr 2024 19:48:30 +0200 Subject: [PATCH 2/3] Revert "allow hyphen in jsx prop names" (#6705) (#6731) This reverts commit 1ec144b4acd8ca54438a946bb6c666159f7afa7e. --- CHANGELOG.md | 4 ++++ jscomp/syntax/src/res_printer.ml | 1 - .../syntax/tests/printer/expr/expected/exoticIdent.res.txt | 2 +- jscomp/syntax/tests/printer/expr/expected/jsx.res.txt | 5 ----- jscomp/syntax/tests/printer/expr/jsx.res | 1 - 5 files changed, 5 insertions(+), 8 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 2ccaf4bd3e..8449ec9292 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -12,6 +12,10 @@ # 11.1.0-rc.9 (Unreleased) +#### :bug: Bug Fix + +- revert escape JSX prop names with hyphens (#6705). https://github.com/rescript-lang/rescript-compiler/pull/6731. + # 11.1.0-rc.8 #### :rocket: New Feature diff --git a/jscomp/syntax/src/res_printer.ml b/jscomp/syntax/src/res_printer.ml index 96541a8d06..c7a715f8ce 100644 --- a/jscomp/syntax/src/res_printer.ml +++ b/jscomp/syntax/src/res_printer.ml @@ -4410,7 +4410,6 @@ and printJsxProps ~state args cmtTbl : Doc.t * Parsetree.expression option = loop [] args and printJsxProp ~state arg cmtTbl = - let printIdentLike ident = printIdentLike ~allowHyphen:true ident in match arg with | ( ((Asttypes.Labelled lblTxt | Optional lblTxt) as lbl), { diff --git a/jscomp/syntax/tests/printer/expr/expected/exoticIdent.res.txt b/jscomp/syntax/tests/printer/expr/expected/exoticIdent.res.txt index 21212ee4a8..d3dc9ecd77 100644 --- a/jscomp/syntax/tests/printer/expr/expected/exoticIdent.res.txt +++ b/jscomp/syntax/tests/printer/expr/expected/exoticIdent.res.txt @@ -62,7 +62,7 @@ lazy \"let" let x = 1 let x = -
+
\"module" \"let"
diff --git a/jscomp/syntax/tests/printer/expr/expected/jsx.res.txt b/jscomp/syntax/tests/printer/expr/expected/jsx.res.txt index e3912ef814..8c689a829c 100644 --- a/jscomp/syntax/tests/printer/expr/expected/jsx.res.txt +++ b/jscomp/syntax/tests/printer/expr/expected/jsx.res.txt @@ -47,11 +47,6 @@ let x = {a} -let x = - - {a} - - let x =
diff --git a/jscomp/syntax/tests/printer/expr/jsx.res b/jscomp/syntax/tests/printer/expr/jsx.res index a44ecaa71f..c86868bc38 100644 --- a/jscomp/syntax/tests/printer/expr/jsx.res +++ b/jscomp/syntax/tests/printer/expr/jsx.res @@ -17,7 +17,6 @@ let x = {a} let x = {a} {b} let x = {a} let x = {a} -let x = {a} let x =
Date: Fri, 19 Apr 2024 13:08:49 +0200 Subject: [PATCH 3/3] Set version to 11.1.0 (#6733) --- CHANGELOG.md | 4 ++-- jscomp/common/bs_version.ml | 2 +- package-lock.json | 4 ++-- package.json | 2 +- packages/std/package.json | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 8449ec9292..39ae73628c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -10,11 +10,11 @@ > - :house: [Internal] > - :nail_care: [Polish] -# 11.1.0-rc.9 (Unreleased) +# 11.1.0 #### :bug: Bug Fix -- revert escape JSX prop names with hyphens (#6705). https://github.com/rescript-lang/rescript-compiler/pull/6731. +- Revert escape JSX prop names with hyphens (#6705). https://github.com/rescript-lang/rescript-compiler/pull/6731 # 11.1.0-rc.8 diff --git a/jscomp/common/bs_version.ml b/jscomp/common/bs_version.ml index be5ed45a82..a7dba66da6 100644 --- a/jscomp/common/bs_version.ml +++ b/jscomp/common/bs_version.ml @@ -21,6 +21,6 @@ * You should have received a copy of the GNU Lesser General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *) -let version = "11.1.0-rc.9" +let version = "11.1.0" let header = "// Generated by ReScript, PLEASE EDIT WITH CARE" let package_name = ref "rescript" diff --git a/package-lock.json b/package-lock.json index 149c42c3fe..0dce2c204d 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "rescript", - "version": "11.1.0-rc.9", + "version": "11.1.0", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "rescript", - "version": "11.1.0-rc.9", + "version": "11.1.0", "hasInstallScript": true, "license": "SEE LICENSE IN LICENSE", "bin": { diff --git a/package.json b/package.json index 206bfc2cbd..b7c5ca3c7d 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "rescript", - "version": "11.1.0-rc.9", + "version": "11.1.0", "devDependencies": { "mocha": "10.1.0", "nyc": "15.0.0", diff --git a/packages/std/package.json b/packages/std/package.json index 0ac0ce407e..6d1d5a7ccd 100644 --- a/packages/std/package.json +++ b/packages/std/package.json @@ -1,6 +1,6 @@ { "name": "@rescript/std", - "version": "11.1.0-rc.9", + "version": "11.1.0", "keywords": [ "rescript", "stdlib",