Merge branch '11.0_release' into import-attributes

Author: zth

.github/workflows/ci.yml

@@ -109,7 +109,12 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [macos-latest, ubuntu-latest, windows-latest, macos-arm]
+        os: [
+            macos-13, # x64
+            macos-14, # ARM
+            ubuntu-latest,
+            windows-latest,
+          ]
         ocaml_compiler: [4.14.0]
 
     runs-on: ${{matrix.os}}
@@ -230,24 +235,24 @@ jobs:
         if: runner.os == 'Windows'
         run: node scripts/ciTest.js -mocha -theme -format
 
-      # Build the playground compiler on our fastest runner (macOS ARM)
+      # Build the playground compiler on the fastest runner (ubuntu-latest)
       - name: Install JSOO
-        if: matrix.os == 'macos-arm'
+        if: matrix.os == 'ubuntu-latest'
         run: opam install js_of_ocaml.4.0.0
 
       - name: Build playground compiler
-        if: matrix.os == 'macos-arm'
+        if: matrix.os == 'ubuntu-latest'
         run: |
           opam exec -- node packages/playground-bundling/scripts/generate_cmijs.js
           opam exec -- dune build --profile browser
           cp ./_build/default/jscomp/jsoo/jsoo_playground_main.bc.js playground/compiler.js
 
       - name: Test playground compiler
-        if: matrix.os == 'macos-arm'
+        if: matrix.os == 'ubuntu-latest'
         run: node playground/playground_test.js
 
       - name: Upload playground compiler to CDN
-        if: ${{ matrix.os == 'macos-arm' && startsWith(github.ref, 'refs/tags/v') }}
+        if: ${{ matrix.os == 'ubuntu-latest' && startsWith(github.ref, 'refs/tags/v') }}
         env:
           KEYCDN_USER: ${{ secrets.KEYCDN_USER }}
           KEYCDN_PASSWORD: ${{ secrets.KEYCDN_PASSWORD }}
@@ -324,10 +329,9 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os:
-          [
-            macos-latest,
-            macos-arm,
+        os: [
+            macos-13, # x64
+            macos-14, # ARM
             ubuntu-latest,
             buildjet-2vcpu-ubuntu-2204-arm,
             windows-latest,

CHANGELOG.md

@@ -10,11 +10,13 @@
 > - :house: [Internal]
 > - :nail_care: [Polish]
 
-# 11.1.0 (Unreleased)
+# 11.1.0-rc.2 (Unreleased)
+
+# 11.1.0-rc.1
 
 #### :rocket: New Feature
 
-- Experimental support of tagged template literals, eg ```sql`select * from ${table}```. https://github.com/rescript-lang/rescript-compiler/pull/6250
+- Experimental support of tagged template literals, e.g. ```sql`select * from ${table}```. https://github.com/rescript-lang/rescript-compiler/pull/6250
 - Experimental support for generic/custom JSX transforms. https://github.com/rescript-lang/rescript-compiler/pull/6565
 - `dict` is now a builtin type. https://github.com/rescript-lang/rescript-compiler/pull/6590
 

docs/docson/build-schema.json

@@ -323,8 +323,7 @@
         },
         "module": {
           "type": "string",
-          "enum": ["react"],
-          "description": "JSX module, currently only support the React."
+          "description": "JSX module. Either \"react\" for React, or (since v11.1) any valid module name to apply a generic JSX transform."
         },
         "mode": {
           "type": "string",

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"
+let version = "11.1.0-rc.2"
 let header = "// Generated by ReScript, PLEASE EDIT WITH CARE"
 let package_name = ref "rescript"

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "rescript",
-  "version": "11.1.0",
+  "version": "11.1.0-rc.2",
   "devDependencies": {
     "mocha": "10.1.0",
     "nyc": "15.0.0",

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rescript/std",
-  "version": "11.1.0",
+  "version": "11.1.0-rc.2",
   "keywords": [
     "rescript",
     "stdlib",