Pin webpack to 5.104.1 and improve website CI workflow

Pin webpack to 5.104.1 to fix website build failure caused by webpack
5.105+ removing the `name` option from ProgressPlugin, which Docusaurus
still uses. Also add a step to merge PR head into the release branch so
website CI tests the PR's actual changes.

Author: saitcakmak

.github/workflows/publish_website.yml

@@ -47,8 +47,13 @@ jobs:
       run: |
         git config --global user.name "github-actions[bot]"
         git config --global user.email "41898282+github-actions[bot]@users.noreply.github.com"
-        git merge origin/main
+        git merge origin/main --no-edit
         # To avoid a large number of commits we don't push this sync commit to github until a new release.
+    - if: ${{ github.event_name == 'pull_request' }}
+      name: Merge PR head into release branch
+      run: |
+        git fetch origin "refs/pull/${{ github.event.pull_request.number }}/head:pr-head"
+        git merge pr-head --no-edit
     - name: Install uv
       uses: astral-sh/setup-uv@v7
     - name: Set up Python

website/package.json

@@ -25,7 +25,11 @@
     "react-dom": "^18.3.1",
     "react-plotly.js": "^2.5.1",
     "rehype-katex": "7",
-    "remark-math": "6"
+    "remark-math": "6",
+    "webpack": "5.104.1"
+  },
+  "resolutions": {
+    "webpack": "5.104.1"
   },
   "engines": {
     "node": ">=18.0"