Merge branch 'master' into global-completion-config

Author: fhammerschmidt

.devcontainer/Dockerfile

@@ -4,6 +4,7 @@ LABEL org.opencontainers.image.description="Docker image for ReScript developmen
 
 RUN apt-get update && export DEBIAN_FRONTEND=noninteractive \
     && apt-get -y install --no-install-recommends \
+    yarn \
     opam \
     musl-tools \
     python-is-python3 \

.gitattributes

@@ -2,3 +2,5 @@
 *.mli linguist-language=OCaml
 *.res linguist-language=ReScript
 *.resi linguist-language=ReScript
+
+.yarn/releases/* binary linguist-vendored

.github/workflows/ci.yml

@@ -45,6 +45,11 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v4
 
+      - name: Use Node.js
+        uses: actions/setup-node@v4
+        with:
+          node-version-file: .nvmrc
+
       - name: Restore build cache
         id: build-cache
         uses: actions/cache@v4
@@ -109,8 +114,6 @@ jobs:
           # Verify that the compiler still builds with older OCaml versions
           - os: ubuntu-24.04
             ocaml_compiler: ocaml-variants.5.2.1+options,ocaml-option-static
-            # Reanalyze does not work on OCaml 5.3.0 anymore, therefore run it on 5.2.1
-            run_reanalyze: true
           - os: ubuntu-24.04
             ocaml_compiler: ocaml-variants.5.0.0+options,ocaml-option-static
           - os: ubuntu-24.04
@@ -137,6 +140,7 @@ jobs:
       - name: Use Node.js
         uses: actions/setup-node@v4
         with:
+          cache: yarn
           node-version-file: .nvmrc
 
       - name: Get artifact dir name
@@ -153,7 +157,7 @@ jobs:
       # matrix.ocaml_compiler may contain commas
       - name: Get OPAM cache key
         shell: bash
-        run: echo "opam_cache_key=opam-env-v7-${{ 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('*.opam') }}" | sed 's/,/-/g' >> $GITHUB_ENV
 
       - name: Restore OPAM environment
         id: cache-opam-env
@@ -191,10 +195,6 @@ jobs:
         if: steps.cache-opam-env.outputs.cache-hit != 'true'
         run: opam install . --deps-only --with-test
 
-      - name: "Install reanalyze"
-        if: steps.cache-opam-env.outputs.cache-hit != 'true' && matrix.run_reanalyze
-        run: opam install reanalyze
-
       - name: Cache OPAM environment
         if: steps.cache-opam-env.outputs.cache-hit != 'true'
         uses: actions/cache/save@v4
@@ -250,6 +250,24 @@ jobs:
           fi
         shell: bash
 
+      - name: Compiler build state key
+        id: compiler-build-state-key
+        shell: bash
+        run: |
+          echo "value=compiler-build-state-v1-${{ matrix.os }}-${{ matrix.ocaml_compiler }}-${{ hashFiles('*.opam') }}" \
+            | sed 's/,/-/g' >> "$GITHUB_OUTPUT"
+
+      - name: Restore compiler build state
+        if: github.base_ref == 'master' || github.ref == 'refs/heads/master'
+        id: compiler-build-state
+        uses: actions/cache/restore@v4
+        with:
+          path: |
+            D:\.cache\dune
+            ~/.cache/dune
+            _build
+          key: ${{ steps.compiler-build-state-key.outputs.value }}
+
       - name: Build compiler
         if: runner.os != 'Linux'
         run: opam exec -- dune build --display quiet --profile release
@@ -258,8 +276,30 @@ jobs:
         if: runner.os == 'Linux'
         run: opam exec -- dune build --display quiet --profile static
 
+      - name: Delete stable compiler build state
+        if: github.event_name == 'push' && github.ref == 'refs/heads/master'
+        shell: bash
+        run: |
+          gh extension install actions/gh-actions-cache
+          gh actions-cache delete ${{ steps.compiler-build-state-key.outputs.value }} \
+            -R ${{ github.repository }} \
+            -B ${{ github.ref }} \
+            --confirm || echo "not exist"
+        env:
+          GH_TOKEN: ${{ github.token }}
+
+      - name: Save compiler build state
+        if: github.event_name == 'push' && github.ref == 'refs/heads/master'
+        uses: actions/cache/save@v4
+        with:
+          path: |
+            D:\.cache\dune
+            ~/.cache/dune
+            _build
+          key: ${{ steps.compiler-build-state-key.outputs.value }}
+
       - name: Install npm packages
-        run: npm ci --ignore-scripts
+        run: yarn install
 
       - name: Copy compiler exes to platform bin dir
         run: node ./scripts/copyExes.js -compiler
@@ -305,10 +345,6 @@ jobs:
         if: ${{ runner.os == 'Windows' }}
         run: opam exec -- make test-syntax
 
-      - name: "Syntax: Run reanalyze"
-        if: matrix.run_reanalyze
-        run: opam exec -- make reanalyze
-
       - name: Build runtime/stdlib
         run: ./scripts/buildRuntime.sh
         shell: bash
@@ -370,11 +406,11 @@ jobs:
         run: |
           opam exec -- node packages/playground-bundling/scripts/generate_cmijs.js
           opam exec -- dune build --profile browser
-          cp ./_build/default/compiler/jsoo/jsoo_playground_main.bc.js playground/compiler.js
+          cp ./_build/default/compiler/jsoo/jsoo_playground_main.bc.js playground/compiler.cjs
 
       - name: Test playground compiler
         if: matrix.build_playground
-        run: node playground/playground_test.js
+        run: node playground/playground_test.cjs
 
       - name: Upload playground compiler to CDN
         if: ${{ matrix.build_playground && startsWith(github.ref, 'refs/tags/v') }}
@@ -411,10 +447,11 @@ jobs:
       - name: Use Node.js
         uses: actions/setup-node@v4
         with:
+          cache: yarn
           node-version-file: .nvmrc
 
       - name: NPM install
-        run: npm ci --ignore-scripts
+        run: yarn install
 
       - name: Download artifacts
         uses: actions/download-artifact@v4
@@ -505,6 +542,7 @@ jobs:
       - name: Use Node.js
         uses: actions/setup-node@v4
         with:
+          cache: yarn
           node-version-file: .nvmrc
           registry-url: https://registry.npmjs.org # Needed to make auth work for publishing
 

.github/workflows/get_artifact_dir_name.js

@@ -1,10 +1,10 @@
-const fs = require("fs");
-const os = require("os");
+import * as fs from "node:fs";
+import * as os from "node:os";
 
-const { dirName: artifactDirName } = require("../../cli/bin_path.js");
+import { platformName } from "#cli/bins";
 
 // Pass artifactDirName to subsequent GitHub actions
 fs.appendFileSync(
   process.env.GITHUB_ENV,
-  `artifact_dir_name=${artifactDirName}${os.EOL}`,
+  `artifact_dir_name=${platformName}${os.EOL}`,
 );

.github/workflows/prepare_package_upload.js

@@ -1,7 +1,8 @@
-const fs = require("fs");
-const os = require("os");
+import * as fs from "node:fs";
+import * as os from "node:os";
+
+import packageSpec from "rescript/package.json" with { type: "json" };
 
-const packageSpec = require("rescript/package.json");
 const { version } = packageSpec;
 
 const commitHash = process.argv[2] || process.env.GITHUB_SHA;

.gitignore

@@ -72,7 +72,7 @@ playground/stdlib/
 playground/*.cmj
 playground/*.cmi
 playground/.netrc
-playground/compiler.js
+playground/compiler.*js
 
 rewatch/target/
 rewatch/rewatch
@@ -81,3 +81,12 @@ tests/tools_tests/**/*.res.js
 tests/tools_tests/lib
 tests/analysis_tests*/lib
 tests/analysis_tests/**/*.bs.js
+
+.yarn/*
+!.yarn/patches
+!.yarn/plugins
+!.yarn/releases
+!.yarn/sdks
+!.yarn/versions
+
+*.tsbuildinfo

.nvmrc

@@ -1 +1 @@
-18
+20