Merge master into vlk/fix-algolia

Resolve the package.json and yarn.lock conflicts by keeping master's formatting and test updates while preserving the Algolia env split, disabled-search fallback, and search-index build wiring.

Author: jderochervlk

.github/workflows/clear-ok-to-deploy.yml

@@ -10,7 +10,7 @@ jobs:
       pull-requests: write
     steps:
       - name: Remove ok-to-deploy label
-        uses: actions/github-script@v7
+        uses: actions/github-script@v9.0.0
         with:
           script: |
             const pr = context.payload.pull_request;

.github/workflows/deploy-fork-preview.yml

@@ -21,7 +21,7 @@ jobs:
       # pull-requests: write, so we can't post PR comments here.
       - name: Fetch PR info
         id: pr
-        uses: actions/github-script@v7
+        uses: actions/github-script@v9.0.0
         with:
           script: |
             const inputRaw = core.getInput("pr_number") || (context.payload.inputs && context.payload.inputs.pr_number) || "";
@@ -49,18 +49,20 @@ jobs:
             core.setOutput("is_fork", pr.head.repo.fork ? "true" : "false");
 
       - name: Checkout PR head
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6.0.2
         with:
           repository: ${{ steps.pr.outputs.repo }}
           ref: ${{ steps.pr.outputs.sha }}
           persist-credentials: false
 
-      - name: Setup yarn
-        uses: actions/setup-node@v4
+      - name: Setup Node.js environment
+        uses: actions/setup-node@v6.3.0
         with:
           node-version-file: ".node-version"
           cache: "yarn"
 
+      - name: Enable Corepack
+        run: corepack enable
       - name: Install dependencies
         run: yarn install
 

.github/workflows/deploy.yml

@@ -20,13 +20,17 @@ jobs:
       contents: read
       deployments: write
       pull-requests: write
+    outputs:
+      deployment-url: ${{ steps.deploy.outputs.deployment-url }}
     steps:
-      - uses: actions/checkout@v4
-      - name: Setup yarn
-        uses: actions/setup-node@v3
+      - uses: actions/checkout@v6.0.2
+      - name: Setup Node.js environment
+        uses: actions/setup-node@v6.3.0
         with:
+          node-version-file: ".node-version"
           cache: "yarn"
-          node-version: "24"
+      - name: Enable Corepack
+        run: corepack enable
       - name: Install dependencies
         run: yarn install
       - name: Sync playground bundles
@@ -40,9 +44,9 @@ jobs:
              echo "VITE_DEPLOYMENT_URL=" >> "$GITHUB_ENV"
           else
              SAFE_BRANCH="${RAW_BRANCH//\//-}"
-             
+
              SAFE_BRANCH=$(echo "$SAFE_BRANCH" | tr '[:upper:]' '[:lower:]')
-             
+
              echo "SAFE_BRANCH=$SAFE_BRANCH" >> "$GITHUB_ENV"
              echo "VITE_DEPLOYMENT_URL=https://${SAFE_BRANCH}.rescript-lang.pages.dev" >> "$GITHUB_ENV"
           fi
@@ -83,6 +87,7 @@ jobs:
         env:
           VITE_DEPLOYMENT_URL: ${{ env.VITE_DEPLOYMENT_URL }}
       - name: Deploy
+        if: ${{ github.actor != 'dependabot[bot]' }}
         id: deploy
         uses: cloudflare/wrangler-action@v3
         with:
@@ -94,6 +99,7 @@ jobs:
         env:
           FORCE_COLOR: 0
       - name: Comment PR with deployment link
+        if: ${{ github.actor != 'dependabot[bot]' }}
         uses: marocchino/sticky-pull-request-comment@v2
         with:
           recreate: true
@@ -104,3 +110,28 @@ jobs:
             Deployment Environment: ${{ steps.deploy.outputs.pages-environment }}
 
             ${{ steps.deploy.outputs.command-output }}
+
+  e2e:
+    runs-on: ubuntu-latest
+    name: E2E Tests
+    needs: deploy
+    if: ${{ github.actor != 'dependabot[bot]' }}
+    steps:
+      - uses: actions/checkout@v6.0.2
+      - name: Setup Node.js environment
+        uses: actions/setup-node@v6.3.0
+        with:
+          node-version-file: ".node-version"
+          cache: "yarn"
+      - name: Enable Corepack
+        run: corepack enable
+      - name: Install dependencies
+        run: yarn install
+      - name: Build ReScript
+        run: yarn build:res
+      - name: Cypress E2E tests
+        uses: cypress-io/github-action@v7
+        with:
+          install: false
+          browser: chrome
+          config: baseUrl=${{ needs.deploy.outputs.deployment-url }}

.github/workflows/pull-request.yml

@@ -5,12 +5,14 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v4
-      - name: Setup node
-        uses: actions/setup-node@v4
+        uses: actions/checkout@v6.0.2
+      - name: Setup Node.js environment
+        uses: actions/setup-node@v6.3.0
         with:
           node-version-file: ".node-version"
           cache: yarn
+      - name: Enable Corepack
+        run: corepack enable
       - name: Install dependencies
         run: yarn
       - name: Format check
@@ -19,31 +21,36 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v4
-      - name: Setup node
-        uses: actions/setup-node@v4
+        uses: actions/checkout@v6.0.2
+      - name: Setup Node.js environment
+        uses: actions/setup-node@v6.3.0
         with:
           node-version-file: ".node-version"
           cache: yarn
+      - name: Enable Corepack
+        run: corepack enable
       - name: Install dependencies
         run: yarn
       - name: Test examples and hrefs
         run: yarn test
   Vitest:
     runs-on: ubuntu-latest
+    container:
+      # Keep this image tag aligned with package.json's playwright version.
+      image: mcr.microsoft.com/playwright:v1.59.1-noble
     steps:
       - name: Checkout
-        uses: actions/checkout@v4
-      - name: Setup node
-        uses: actions/setup-node@v4
+        uses: actions/checkout@v6.0.2
+      - name: Setup Node.js environment
+        uses: actions/setup-node@v6.3.0
         with:
           node-version-file: ".node-version"
           cache: yarn
+      - name: Enable Corepack
+        run: corepack enable
       - name: Install dependencies
         run: yarn
       - name: Build ReScript
         run: yarn build:res
-      - name: Install Playwright
-        run: yarn playwright install --with-deps
       - name: Vitest
         run: yarn ci:test

.gitignore

@@ -1,6 +1,7 @@
 .DS_Store
 *.swp
 *.swo
+.worktrees/
 
 # Generated via update-index script
 public/blog/feed.xml
@@ -11,11 +12,9 @@ out/
 index_data/*.json
 
 # Generated via test examples script
-_tempFile.cmi
-_tempFile.cmj
-_tempFile.cmt
-_tempFile.res
 temp
+temp-js-output
+temp-jsx-preserve
 
 .bsb.lock
 .merlin
@@ -42,6 +41,7 @@ public/playground-bundles/
 dist
 build
 .react-router
+.worktrees/
 mdx-manifest.json
 
 app/**/*.mjs
@@ -50,6 +50,8 @@ functions/**/*.mjs
 functions/**/*.jsx
 __tests__/**/*.mjs
 __tests__/**/*.jsx
+e2e/**/*.mjs
+e2e/**/*.jsx
 !_shims.mjs
 !_shims.jsx
 
@@ -70,6 +72,9 @@ _scripts
 # Local env files
 .env.local
 
+# Local git worktrees
+.worktrees
+
 # Vitest screenshots
 !__tests__/__screenshots__/**/*
-.vitest-attachments
+.vitest-attachments

.node-version

@@ -1 +1 @@
-22.16.0
+24.15.0

.oxfmtrc.json

@@ -0,0 +1,42 @@
+{
+  "$schema": "./node_modules/oxfmt/configuration_schema.json",
+  "printWidth": 80,
+  "sortPackageJson": false,
+  "ignorePatterns": [
+    "!_shims.mjs",
+    "!public/_redirects",
+    ".DS_Store",
+    ".worktrees/",
+    ".next/",
+    ".react-router",
+    "*.swo",
+    "*.swp",
+    "app/**/*.mjs",
+    "build",
+    "data/api/**/*.json",
+    "dist",
+    "index_data/*.json",
+    "node_modules/",
+    "out/",
+    "public/playground-bundles/",
+    "public/blog/feed.xml",
+    "_tempFile.cmi",
+    "_tempFile.cmj",
+    "_tempFile.cmt",
+    "_tempFile.res",
+    "temp",
+    ".bsb.lock",
+    ".merlin",
+    "lib/",
+    ".vercel",
+    "src/**/*.mjs",
+    "scripts/gendocs.mjs",
+    "scripts/generate_*.mjs",
+    "public/llms/manual/**/llm*.txt",
+    "public/llms/react/**/llm*.txt",
+    "pages/docs/**/**/llms.mdx",
+    "markdown-pages/docs/manual/installation.mdx",
+    ".yarn/releases/yarn-4.12.0.cjs",
+    "data/api/*"
+  ]
+}