Merge branch 'rescript-lang:master' into unified-operator/lxor

Author: MiryangJung

.devcontainer/postCreate.sh

@@ -2,7 +2,7 @@
 
 # Install dev dependencies from OPAM
 opam init -y --bare --disable-sandboxing
-opam switch create 5.2.1 --packages ocaml-option-static
+opam switch create 5.3.0 --packages ocaml-option-static
 opam install . --deps-only -y
 
 # For IDE support, install the OCaml language server

.github/workflows/ci.yml

@@ -29,9 +29,9 @@ jobs:
             rust-target: x86_64-apple-darwin
           - os: macos-14 # ARM
             rust-target: aarch64-apple-darwin
-          - os: ubuntu-latest # x64
+          - os: ubuntu-24.04 # x64
             rust-target: x86_64-unknown-linux-musl
-          - os: buildjet-2vcpu-ubuntu-2204-arm # ARM
+          - os: ubuntu-24.04-arm # ARM
             rust-target: aarch64-unknown-linux-musl
           - os: windows-latest
             rust-target: x86_64-pc-windows-gnu
@@ -86,33 +86,33 @@ jobs:
       fail-fast: false
       matrix:
         include:
-          - os: ubuntu-latest # x64
-            ocaml_compiler: ocaml-variants.5.2.1+options,ocaml-option-static
+          - os: ubuntu-24.04 # x64
+            ocaml_compiler: ocaml-variants.5.3.0+options,ocaml-option-static
             upload_binaries: true
             upload_libs: true
+          - os: ubuntu-24.04-arm # ARM
+            ocaml_compiler: ocaml-variants.5.3.0+options,ocaml-option-static
+            upload_binaries: true
             # Build the playground compiler and run the benchmarks on the fastest runner
             build_playground: true
             benchmarks: true
-          - os: buildjet-2vcpu-ubuntu-2204-arm # ARM
-            ocaml_compiler: ocaml-variants.5.2.1+options,ocaml-option-static
-            upload_binaries: true
           - os: macos-13 # x64
-            ocaml_compiler: 5.2.1
+            ocaml_compiler: 5.3.0
             upload_binaries: true
           - os: macos-14 # ARM
-            ocaml_compiler: 5.2.1
+            ocaml_compiler: 5.3.0
             upload_binaries: true
           - os: windows-latest
-            ocaml_compiler: 5.2.1
+            ocaml_compiler: 5.3.0
             upload_binaries: true
 
           # Verify that the compiler still builds with older OCaml versions
-          - os: ubuntu-latest
+          - os: ubuntu-24.04
+            ocaml_compiler: ocaml-variants.5.2.1+options,ocaml-option-static
+          - os: ubuntu-24.04
             ocaml_compiler: ocaml-variants.5.0.0+options,ocaml-option-static
-          - os: ubuntu-latest
+          - os: ubuntu-24.04
             ocaml_compiler: ocaml-variants.4.14.2+options,ocaml-option-static
-          - os: ubuntu-latest
-            ocaml_compiler: ocaml-variants.4.13.0+options,ocaml-option-static
 
     runs-on: ${{matrix.os}}
 
@@ -135,23 +135,23 @@ jobs:
       - name: Use Node.js
         uses: actions/setup-node@v4
         with:
-          node-version: 18
+          node-version-file: .nvmrc
 
       - name: Get artifact dir name
         run: node .github/workflows/get_artifact_dir_name.js
 
       - name: Install dependencies (Linux)
         if: runner.os == 'Linux'
-        uses: awalsh128/[email protected].2
+        uses: awalsh128/[email protected].3
         with:
           # See https://github.com/ocaml/setup-ocaml/blob/b2105f9/packages/setup-ocaml/src/unix.ts#L9
           packages: bubblewrap darcs g++-multilib gcc-multilib mercurial musl-tools rsync
-          version: v2
+          version: v3
 
       # matrix.ocaml_compiler may contain commas
       - name: Get OPAM cache key
         shell: bash
-        run: echo "opam_cache_key=opam-env-v6-${{ matrix.os }}-${{ matrix.ocaml_compiler }}-${{ hashFiles('dune-project') }}" | sed 's/,/-/g' >> $GITHUB_ENV
+        run: echo "opam_cache_key=opam-env-v7-${{ matrix.os }}-${{ matrix.ocaml_compiler }}-${{ hashFiles('dune-project') }}" | sed 's/,/-/g' >> $GITHUB_ENV
 
       - name: Restore OPAM environment
         id: cache-opam-env
@@ -167,7 +167,7 @@ jobs:
           key: ${{ env.opam_cache_key }}
 
       - name: Use OCaml ${{matrix.ocaml_compiler}}
-        uses: ocaml/setup-ocaml@v3.1.4
+        uses: ocaml/setup-ocaml@v3.2.5
         if: steps.cache-opam-env.outputs.cache-hit != 'true'
         with:
           ocaml-compiler: ${{matrix.ocaml_compiler}}
@@ -244,11 +244,6 @@ jobs:
           fi
         shell: bash
 
-      # see https://github.com/ocaml/setup-ocaml/issues/815
-      - name: "Windows: set SHELLOPTS=igncr"
-        if: runner.os == 'Windows'
-        run: echo "SHELLOPTS=igncr" >>"$GITHUB_ENV"
-          
       - name: Build compiler
         if: runner.os != 'Linux'
         run: opam exec -- dune build --display quiet --profile release
@@ -274,7 +269,7 @@ jobs:
         if: steps.ninja-build-cache.outputs.cache-hit != 'true'
         uses: actions/setup-python@v5
         with:
-          python-version: '3.10'
+          python-version: "3.10"
 
       - name: Setup MSVC for ninja build (Windows)
         if: steps.ninja-build-cache.outputs.cache-hit != 'true' && runner.os == 'Windows'
@@ -321,7 +316,7 @@ jobs:
         run: git diff --ignore-cr-at-eol --exit-code tests
 
       - name: Run analysis / tools tests
-        if: runner.os != 'Windows' && matrix.os != 'buildjet-2vcpu-ubuntu-2204-arm'
+        if: runner.os != 'Windows' && runner.os != 'Linux'
         run: opam exec -- make -C tests/analysis_tests test && make -C tests/tools_tests test
 
       - name: Run gentype tests
@@ -338,7 +333,7 @@ jobs:
         with:
           path: ./tests/benchmark-cache
           key: syntax-benchmark-v1
- 
+
       - name: Create new benchmark data and comment on alert
         # Do not run for PRs created from other repos as those won't be able to write to the pull request
         if: ${{ matrix.benchmarks && (github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name == github.event.repository.full_name) }}
@@ -359,7 +354,7 @@ jobs:
         with:
           path: ./tests/benchmark-cache
           key: syntax-benchmark-v1
-     
+
       - name: Build playground compiler
         if: matrix.build_playground
         run: |
@@ -396,8 +391,8 @@ jobs:
     needs:
       - build-compiler
       - build-rewatch
-  
-    runs-on: ubuntu-latest
+
+    runs-on: ubuntu-24.04
 
     steps:
       - name: Checkout
@@ -406,7 +401,7 @@ jobs:
       - name: Use Node.js
         uses: actions/setup-node@v4
         with:
-          node-version: 18
+          node-version-file: .nvmrc
 
       - name: NPM install
         run: npm ci --ignore-scripts
@@ -452,8 +447,8 @@ jobs:
         os: [
             macos-13, # x64
             macos-14, # ARM
-            ubuntu-latest,
-            buildjet-2vcpu-ubuntu-2204-arm,
+            ubuntu-24.04,
+            ubuntu-24.04-arm,
             windows-latest,
           ]
 
@@ -466,7 +461,7 @@ jobs:
       - name: Use Node.js
         uses: actions/setup-node@v4
         with:
-          node-version: 18
+          node-version-file: .nvmrc
 
       - name: Download artifacts
         uses: actions/download-artifact@v4
@@ -491,7 +486,7 @@ jobs:
 
     if: startsWith(github.ref, 'refs/tags/v')
 
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-24.04
 
     steps:
       - name: Checkout
@@ -500,7 +495,7 @@ jobs:
       - name: Use Node.js
         uses: actions/setup-node@v4
         with:
-          node-version: 18
+          node-version-file: .nvmrc
           registry-url: https://registry.npmjs.org # Needed to make auth work for publishing
 
       - name: Download artifacts

.nvmrc

@@ -0,0 +1 @@
+18

.ocamlformat

@@ -1,5 +1,5 @@
 profile = default
-version = 0.26.2
+version = 0.27.0
 
 field-space = tight-decl
 break-cases = toplevel
@@ -9,3 +9,4 @@ space-around-arrays = false
 space-around-lists = false
 space-around-records = false
 space-around-variants = false
+parse-docstrings = false

.ocamlformat-ignore

@@ -1,6 +1,5 @@
 compiler/js_parser/**
 compiler/ml/cmt_format.ml
-compiler/ml/pprintast.ml
 compiler/core/js_name_of_module_id.ml
 compiler/core/js_pass_debug.ml
 compiler/core/lam_util.ml