Support Node 25 with corepack-managed pnpm

.github/workflows/backend-tests.yml

@@ -28,7 +28,7 @@ jobs:
       fail-fast: false
       matrix:
         # PRs: test on latest Node only. Push to develop: full matrix.
-        node: ${{ github.event_name == 'pull_request' && fromJSON('[24]') || fromJSON('[22, 24, 25]') }}
+        node: ${{ github.event_name == 'pull_request' && fromJSON('[25]') || fromJSON('[22, 24, 25]') }}
     steps:
       -
         name: Checkout repository
@@ -84,7 +84,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        node: ${{ github.event_name == 'pull_request' && fromJSON('[24]') || fromJSON('[22, 24, 25]') }}
+        node: ${{ github.event_name == 'pull_request' && fromJSON('[25]') || fromJSON('[22, 24, 25]') }}
     steps:
       -
         name: Checkout repository

.github/workflows/build-and-deploy-docs.yml

@@ -61,7 +61,7 @@ jobs:
       - name: Use Node.js
         uses: actions/setup-node@v6
         with:
-          node-version: 22
+          node-version: 25
           cache: pnpm
       - name: Setup Pages
         if: github.event_name == 'push'

.github/workflows/docker.yml

@@ -59,7 +59,7 @@ jobs:
       - name: Use Node.js
         uses: actions/setup-node@v6
         with:
-          node-version: 22
+          node-version: 25
           cache: pnpm
           cache-dependency-path: etherpad/pnpm-lock.yaml
       -

.github/workflows/frontend-admin-tests.yml

@@ -22,7 +22,7 @@ jobs:
       fail-fast: false
       matrix:
         # PRs: single Node version. Push: full matrix.
-        node: ${{ github.event_name == 'pull_request' && fromJSON('[24]') || fromJSON('[22, 24, 25]') }}
+        node: ${{ github.event_name == 'pull_request' && fromJSON('[25]') || fromJSON('[22, 24, 25]') }}
 
     steps:
       -

.github/workflows/frontend-tests.yml

@@ -42,7 +42,7 @@ jobs:
       - name: Use Node.js
         uses: actions/setup-node@v6
         with:
-          node-version: 22
+          node-version: 25
           cache: pnpm
       -
         name: Install all dependencies and symlink for ep_etherpad-lite
@@ -114,7 +114,7 @@ jobs:
       - name: Use Node.js
         uses: actions/setup-node@v6
         with:
-          node-version: 22
+          node-version: 25
           cache: pnpm
       - name: Install all dependencies and symlink for ep_etherpad-lite
         run: pnpm install --frozen-lockfile
@@ -190,7 +190,7 @@ jobs:
       - name: Use Node.js
         uses: actions/setup-node@v6
         with:
-          node-version: 22
+          node-version: 25
           cache: pnpm
       - name: Install all dependencies and symlink for ep_etherpad-lite
         run: pnpm install --frozen-lockfile
@@ -291,7 +291,7 @@ jobs:
       - name: Use Node.js
         uses: actions/setup-node@v6
         with:
-          node-version: 22
+          node-version: 25
           cache: pnpm
       - name: Install all dependencies and symlink for ep_etherpad-lite
         run: pnpm install --frozen-lockfile

.github/workflows/handleRelease.yml

@@ -42,7 +42,7 @@ jobs:
       - name: Use Node.js
         uses: actions/setup-node@v6
         with:
-          node-version: 22
+          node-version: 25
           cache: pnpm
       - name: Install all dependencies and symlink for ep_etherpad-lite
         run: pnpm install --frozen-lockfile

.github/workflows/installer-test.yml

@@ -42,16 +42,16 @@ jobs:
 
       - uses: actions/setup-node@v6
         with:
-          node-version: 22
+          node-version: 25
 
       - name: Pre-install pnpm (avoid sudo prompt in the installer)
         run: npm install -g pnpm
 
       - name: Run bin/installer.sh against this commit
         env:
           ETHERPAD_DIR: ${{ runner.temp }}/etherpad-installer-test
-          ETHERPAD_REPO: ${{ github.server_url }}/${{ github.repository }}.git
-          ETHERPAD_BRANCH: ${{ github.head_ref || github.ref_name }}
+          ETHERPAD_REPO: ${{ github.event_name == 'pull_request' && github.event.pull_request.head.repo.clone_url || format('{0}/{1}.git', github.server_url, github.repository) }}
+          ETHERPAD_BRANCH: ${{ github.event_name == 'pull_request' && github.event.pull_request.head.ref || github.ref_name }}
           NO_COLOR: "1"
         run: sh ./bin/installer.sh
 
@@ -104,7 +104,7 @@ jobs:
 
       - uses: actions/setup-node@v6
         with:
-          node-version: 22
+          node-version: 25
 
       - name: Pre-install pnpm
         run: npm install -g pnpm
@@ -113,8 +113,8 @@ jobs:
         shell: pwsh
         env:
           ETHERPAD_DIR: ${{ runner.temp }}\etherpad-installer-test
-          ETHERPAD_REPO: ${{ github.server_url }}/${{ github.repository }}.git
-          ETHERPAD_BRANCH: ${{ github.head_ref || github.ref_name }}
+          ETHERPAD_REPO: ${{ github.event_name == 'pull_request' && github.event.pull_request.head.repo.clone_url || format('{0}/{1}.git', github.server_url, github.repository) }}
+          ETHERPAD_BRANCH: ${{ github.event_name == 'pull_request' && github.event.pull_request.head.ref || github.ref_name }}
           NO_COLOR: "1"
         run: ./bin/installer.ps1
 

.github/workflows/load-test.yml

@@ -39,7 +39,7 @@ jobs:
       - name: Use Node.js
         uses: actions/setup-node@v6
         with:
-          node-version: 22
+          node-version: 25
           cache: pnpm
       -
         name: Install all dependencies and symlink for ep_etherpad-lite
@@ -77,7 +77,7 @@ jobs:
       - name: Use Node.js
         uses: actions/setup-node@v6
         with:
-          node-version: 22
+          node-version: 25
           cache: pnpm
       -
         name: Install etherpad-load-test
@@ -140,7 +140,7 @@ jobs:
       - name: Use Node.js
         uses: actions/setup-node@v6
         with:
-          node-version: 22
+          node-version: 25
           cache: pnpm
       -
         name: Install all dependencies and symlink for ep_etherpad-lite

.github/workflows/perform-type-check.yml

@@ -39,7 +39,7 @@ jobs:
       - name: Use Node.js
         uses: actions/setup-node@v6
         with:
-          node-version: 22
+          node-version: 25
           cache: pnpm
       - name: Install all dependencies and symlink for ep_etherpad-lite
         run: pnpm install --frozen-lockfile

.github/workflows/rate-limit.yml

@@ -42,7 +42,7 @@ jobs:
       - name: Use Node.js
         uses: actions/setup-node@v6
         with:
-          node-version: 22
+          node-version: 25
           cache: pnpm
 
       -

.github/workflows/release.yml

@@ -64,7 +64,7 @@ jobs:
       - name: Use Node.js
         uses: actions/setup-node@v6
         with:
-          node-version: 22
+          node-version: 25
           cache: pnpm
           cache-dependency-path: etherpad/pnpm-lock.yaml
       - name: Install dependencies ether.github.com

.github/workflows/releaseEtherpad.yml

@@ -19,7 +19,7 @@ jobs:
             # OIDC trusted publishing needs npm >= 11.5.1, which requires
             # Node >= 22.9.0. setup-node's `22` resolves to the latest
             # 22.x, which satisfies that.
-            node-version: 22
+            node-version: 25
             registry-url: https://registry.npmjs.org/
         - name: Upgrade npm to >=11.5.1 (required for trusted publishing)
           run: npm install -g npm@latest

.github/workflows/update-plugins.yml

@@ -26,7 +26,7 @@ jobs:
       - name: Use Node.js
         uses: actions/setup-node@v6
         with:
-          node-version: 22
+          node-version: 25
 
       - name: Install bin dependencies
         working-directory: ./bin

.github/workflows/upgrade-from-latest-release.yml

@@ -28,13 +28,16 @@ jobs:
       fail-fast: false
       matrix:
         # PRs: single Node version. Push: full matrix.
-        node: ${{ github.event_name == 'pull_request' && fromJSON('[24]') || fromJSON('[22, 24, 25]') }}
+        node: ${{ github.event_name == 'pull_request' && fromJSON('[25]') || fromJSON('[22, 24, 25]') }}
     steps:
       -
         name: Check out latest release
         uses: actions/checkout@v6
         with:
-          ref: develop #FIXME change to master when doing release
+          fetch-depth: 0
+      -
+        name: Check out latest release tag
+        run: git checkout "$(git tag --list 'v*' --sort=-version:refname | head -n1)"
       - uses: actions/cache@v5
         name: Cache pnpm store
         with:
@@ -84,13 +87,10 @@ jobs:
       -
         name: Install all dependencies and symlink for ep_etherpad-lite
         run: pnpm install --frozen-lockfile
-      # Because actions/checkout@v6 is called with "ref: master" and without
-      # "fetch-depth: 0", the local clone does not have the ${GITHUB_SHA}
-      # commit. Fetch ${GITHUB_REF} to get the ${GITHUB_SHA} commit. Note that a
-      # plain "git fetch" only fetches "normal" references (refs/heads/* and
-      # refs/tags/*), and for pull requests none of the normal references
-      # include ${GITHUB_SHA}, so we have to explicitly tell Git to fetch
-      # ${GITHUB_REF}.
+      # The job starts from the latest release tag, so fetch the pull-request
+      # ref explicitly before checking out ${GITHUB_SHA}. A plain "git fetch"
+      # only brings "normal" references (refs/heads/* and refs/tags/*), and for
+      # pull requests none of those include the synthetic merge commit.
       -
         name: Fetch the new Git commits
         run: git fetch --depth=1 origin "${GITHUB_REF}"

CHANGELOG.md

@@ -60,7 +60,7 @@
 
 - The HTTP client in the backend has been migrated from `axios` to the built-in `fetch` API, dropping a dependency now that Node 22 ships a stable fetch.
 - `admin/` and `ui/` workspaces moved from `rolldown-vite` to upstream **Vite 8**.
-- Build and CI moved to **pnpm 11** (`packageManager: "pnpm@11.0.6"`); the `Dockerfile`, snap, and all GitHub workflows are aligned. pnpm overrides have been migrated from `package.json` to `pnpm-workspace.yaml` to match pnpm 11's expectations.
+- Build and CI moved to **pnpm 11** (`packageManager: "pnpm@11.1.2"`); the `Dockerfile`, snap, and all GitHub workflows are aligned. pnpm overrides have been migrated from `package.json` to `pnpm-workspace.yaml` to match pnpm 11's expectations.
 - All client modules have been converted to ESM.
 - The CI matrix tests Node 22, 24, and 25; on PRs the matrix is reduced to a single Node version to keep feedback fast.
 - Frontend Playwright tests now run against the `/ether` plugin set, with feature-tag based skips so plugin-incompatible specs are excluded automatically.

Dockerfile

@@ -210,7 +210,7 @@ COPY --chown=etherpad:etherpad ${SETTINGS} "${EP_DIR}"/settings.json
 
 USER etherpad
 
-HEALTHCHECK --interval=5s --timeout=3s \
+HEALTHCHECK --interval=5s --timeout=3s --start-period=30s \
   CMD wget -qO- http://127.0.0.1:9001/health | grep -E "pass|ok|up" > /dev/null || exit 1
 
 EXPOSE 9001

README.md

@@ -254,6 +254,8 @@ git switch -c v2.2.5
 ```sh
 ./bin/run.sh
 ```
+   This uses the pinned pnpm from `package.json`, via `pnpm` when available or
+   `corepack pnpm` otherwise.
 6. Stop with [CTRL-C]
 7. Restart your Etherpad service
 

admin/src/pages/AuthorPage.tsx

@@ -1,18 +1,23 @@
 import {Trans, useTranslation} from "react-i18next";
 import {useEffect, useMemo, useState} from "react";
 import * as Dialog from "@radix-ui/react-dialog";
-import {ChevronLeft, ChevronRight, Trash2} from "lucide-react";
+import {ChevronLeft, ChevronRight, Search, Trash2} from "lucide-react";
 import {useStore} from "../store/store.ts";
-import {SearchField} from "../components/SearchField.tsx";
 import {ColorSwatch} from "../components/ColorSwatch.tsx";
 import {IconButton} from "../components/IconButton.tsx";
-import {determineSorting} from "../utils/sorting.ts";
 import {useDebounce} from "../utils/useDebounce.ts";
 import {
   AnonymizePreview, AnonymizeResult, AuthorRow, AuthorSearchQuery,
   AuthorSearchResult, AuthorSortBy,
 } from "../utils/AuthorSearch.ts";
 
+const determineSorting = (sortBy: string, ascending: boolean, currentSymbol: string) => {
+  if (sortBy === currentSymbol) {
+    return ascending ? 'sort up' : 'sort down';
+  }
+  return 'sort none';
+};
+
 type DialogState =
   | {phase: 'closed'}
   | {phase: 'loading-preview', authorID: string, name: string | null}
@@ -203,9 +208,12 @@ export const AuthorPage = () => {
       </h1>
     </span>
 
-    <SearchField value={searchTerm}
-                 onChange={(v) => setSearchTerm(v.target.value)}
-                 placeholder={t('ep_admin_authors:search-placeholder')}/>
+    <span className="search-field">
+      <input value={searchTerm}
+             onChange={(e) => setSearchTerm(e.target.value)}
+             placeholder={t('ep_admin_authors:search-placeholder')}/>
+      <Search/>
+    </span>
 
     <label style={{display: 'inline-flex', alignItems: 'center', gap: 6,
                    margin: '8px 0'}}>

bin/functions.sh

@@ -12,6 +12,29 @@ error() { log "ERROR: $@" >&2; }
 fatal() { error "$@"; exit 1; }
 is_cmd() { command -v "$@" >/dev/null 2>&1; }
 
+ensure_pnpm() {
+  if is_cmd pnpm; then return 0; fi
+  is_cmd corepack || fatal "Please install pnpm or corepack."
+  corepack pnpm --version >/dev/null 2>&1 || \
+    fatal "corepack is available but could not provision pnpm."
+}
+
+run_pnpm() {
+  if is_cmd pnpm; then
+    pnpm "$@"
+  else
+    corepack pnpm "$@"
+  fi
+}
+
+exec_pnpm() {
+  if is_cmd pnpm; then
+    exec pnpm "$@"
+  else
+    exec corepack pnpm "$@"
+  fi
+}
+
 
 get_program_version() {
   PROGRAM="$1"

bin/installDeps.sh

@@ -8,7 +8,7 @@ cd "${MY_DIR}/.." || exit 1
 # Source constants and useful functions
 . bin/functions.sh
 
-is_cmd pnpm || npm install pnpm -g
+ensure_pnpm
 
 
 # Is node installed?
@@ -36,10 +36,10 @@ fi
 log "Installing dependencies..."
 if [ -z "${ETHERPAD_PRODUCTION}" ]; then
   log "Installing dev dependencies with pnpm"
-  pnpm --recursive i  || exit 1
+  run_pnpm --recursive i  || exit 1
 else
   log "Installing production dependencies with pnpm"
-  pnpm --recursive i --production || exit 1
+  run_pnpm --recursive i --production || exit 1
 fi
 
 # Remove all minified data to force node creating it new

bin/run.sh

@@ -35,8 +35,8 @@ if [ -z "$NODE_ENV" ] || [ "$NODE_ENV" = "development" ]; then
   ADMIN_UI_PATH="$(dirname "$0")/../admin"
   UI_PATH="$(dirname "$0")/../ui"
   log "Creating the admin UI..."
-  (cd "$ADMIN_UI_PATH" && pnpm run build)
-  (cd "$UI_PATH" && pnpm run build)
+  (cd "$ADMIN_UI_PATH" && run_pnpm run build)
+  (cd "$UI_PATH" && run_pnpm run build)
 else
   log "Cannot create the admin UI in production mode"
 fi
@@ -45,4 +45,4 @@ fi
 log "Starting Etherpad..."
 
 # cd src
-exec pnpm run prod "$@"
+exec_pnpm run prod "$@"