Merge branch 'develop'

Author: Etherpad Release Bot

.github/workflows/docker.yml

@@ -119,7 +119,7 @@ jobs:
         # Regression test for #7718. Reproduces the production
         # docker-compose layout reported in that issue: a named volume
         # mounted on src/plugin_packages with no TTY allocated. Under
-        # the previous `CMD ["pnpm", "run", "prod"]`, pnpm 11's
+        # the previous `CMD ["pnpm", "run", "prod"]`, pnpm's
         # runDepsStatusCheck spuriously decided node_modules was out of
         # sync at boot and tried to wipe + reinstall, aborting with
         # ERR_PNPM_ABORTED_REMOVE_MODULES_DIR_NO_TTY before the HTTP

.github/workflows/release.yml

@@ -69,7 +69,7 @@ jobs:
           cache-dependency-path: etherpad/pnpm-lock.yaml
       - name: Install dependencies ether.github.com
         # ether.github.com depends on sharp (Next.js image pipeline), whose
-        # install script must run to fetch the platform binary. pnpm 11
+        # install script must run to fetch the platform binary. pnpm
         # turned ignored-builds into an error; allow all builds for this
         # external repo since we don't control its pnpm-workspace.yaml.
         run: pnpm install --frozen-lockfile --config.dangerously-allow-all-builds=true

CHANGELOG.md

@@ -1,3 +1,12 @@
+# 3.3.5
+
+3.3.5 is a bug-fix follow-up to 3.3.4. It fixes a startup crash on fresh installs when pnpm 12 (now pnpm's default release) is installed, and makes the built-in updater work on Windows.
+
+### Notable fixes
+
+- **Fresh installs no longer crash at startup under pnpm 12 (#8232).** On first boot (no `var/installed_plugins.json`), Etherpad runs `pnpm ls` to migrate plugins found in `node_modules`, passing `--no-production`. pnpm 12 renamed that flag to `--no-prod` and rejects the old name, so the server exited with `Error occurred while starting Etherpad` before it bound a port. The call now uses `--no-prod`, which pnpm 10 and 11 also accept. Existing installs were not affected. The repository, release tooling, Docker image and snap also move to pnpm 12.
+- **Updater — spawn pnpm through `cross-spawn` so updates work on Windows (#8218).** On Windows `pnpm` is a `.cmd` shim that plain `child_process.spawn` can't run, so the built-in update actions failed there. Thanks to Kaan Çelebi.
+
 # 3.3.4
 
 3.3.4 is a security release. It closes a stored XSS in the `createDiffHTML` API output (GHSA-6vx2-3gwr-958v).

Dockerfile

@@ -7,12 +7,12 @@
 #   docker build --build-arg BUILD_ENV=copy .
 ARG BUILD_ENV=git
 
-# NOTE: this intentionally lags the "packageManager" pin in package.json. pnpm
-# 11.1.x enforces the minimum-release-age supply-chain policy during install,
-# which the frozen-lockfile Docker build can't satisfy, so the image stays on
-# 11.0.x. The version gap is made harmless by pnpm_config_pm_on_fail=ignore in
-# the build stage below — see ether/etherpad#7911.
-ARG PnpmVersion=11.0.6
+# NOTE: this tracks the "packageManager" pin in package.json. pnpm's
+# minimum-release-age supply-chain policy (enforced during install) is satisfied
+# by the `minimumReleaseAgeExclude` list in pnpm-workspace.yaml, so the image no
+# longer needs to lag the pin the way it did during the pnpm 11.1.x era — see
+# ether/etherpad#7911.
+ARG PnpmVersion=12.4.2
 
 FROM node:24-alpine AS adminbuild
 # Install pnpm directly via npm (rather than via corepack) so the same
@@ -33,15 +33,13 @@ RUN pnpm run build:ui
 FROM node:24-alpine AS build
 LABEL maintainer="Etherpad team, https://github.com/ether/etherpad"
 
-# The image's pnpm intentionally lags the "packageManager" pin (see the ARG
-# note above). pnpm would otherwise try to self-provision the pinned version on
-# invocation — including the informational `pnpm --version` probe Etherpad runs
-# at startup — which fails closed with no network and breaks air-gapped boots
-# (ether/etherpad#7911). pm_on_fail=ignore makes pnpm use the installed version
-# instead. Inherited by the development and production runtime stages, so it
-# also covers the updater's pnpm-on-PATH check and ad-hoc `pnpm` in an exec
-# shell. It does not change which pnpm runs the build-time install (still the
-# installed 11.0.x), so the frozen-lockfile build is unaffected.
+# The image's pnpm matches the "packageManager" pin (see the ARG note above),
+# so pnpm does not self-provision on invocation. pm_on_fail=ignore is kept as
+# belt-and-suspenders: if the pin and the image ever drift again, pnpm falls
+# back to the installed version instead of downloading the pinned build — which
+# fails closed with no network and breaks air-gapped boots (ether/etherpad#7911).
+# Inherited by the development and production runtime stages, so it also covers
+# the updater's pnpm-on-PATH check and ad-hoc `pnpm` in an exec shell.
 ENV pnpm_config_pm_on_fail=ignore
 
 # Set these arguments when building the image from behind a proxy
@@ -202,7 +200,7 @@ ENV ETHERPAD_PRODUCTION=true
 # needed at runtime. Overwrite it with a production-only version so
 # pnpm install doesn't warn about missing workspace directories.
 # Preserve the build-script policy from the source workspace file so
-# pnpm 11 doesn't error out with ERR_PNPM_IGNORED_BUILDS for transitive
+# pnpm doesn't error out with ERR_PNPM_IGNORED_BUILDS for transitive
 # postinstalls (e.g. @scarf/scarf via swagger-ui-dist).
 RUN printf 'packages:\n  - src\n  - bin\nonlyBuiltDependencies:\n  - esbuild\nignoredBuiltDependencies:\n  - "@scarf/scarf"\nstrictDepBuilds: false\n' > pnpm-workspace.yaml
 
@@ -239,7 +237,7 @@ HEALTHCHECK --interval=5s --timeout=3s \
   CMD wget -qO- http://127.0.0.1:9001/health | grep -E "pass|ok|up" > /dev/null || exit 1
 
 EXPOSE 9001
-# Run node directly instead of via `pnpm run prod`. pnpm 11's
+# Run node directly instead of via `pnpm run prod`. pnpm's
 # `runDepsStatusCheck` fires before every `pnpm run …` and spuriously
 # decides node_modules is out of sync on first start under the named-
 # volume layout used by docker-compose (mounting src/plugin_packages).

admin/package.json

@@ -1,7 +1,7 @@
 {
   "name": "admin",
   "private": true,
-  "version": "3.3.4",
+  "version": "3.3.5",
   "type": "module",
   "scripts": {
     "dev": "pnpm gen:api && vite",

bin/installLocalPlugins.sh

@@ -39,7 +39,9 @@ if [ ! -z "${ETHERPAD_LOCAL_PLUGINS}" ]; then
     plugin=$(trim "$plugin")
     if [ -d "local_plugins/${plugin}" ]; then
       echo "Installing plugin: '${plugin}'"
-      pnpm install -w ${PNPM_OPTIONS:-} "local_plugins/${plugin}/"
+      # The `./` prefix is required: without it pnpm treats `local_plugins/<pkg>`
+      # as a scoped package name (or git URL) rather than a local directory.
+      pnpm install -w ${PNPM_OPTIONS:-} "./local_plugins/${plugin}/"
     else
       ( echo "Error. Directory 'local_plugins/${plugin}' for local plugin " \
              "'${plugin}' missing" >&2 )

bin/package.json

@@ -1,6 +1,6 @@
 {
   "name": "bin",
-  "version": "3.3.4",
+  "version": "3.3.5",
   "description": "",
   "main": "checkAllPads.js",
   "directories": {

bin/release.ts

@@ -204,7 +204,7 @@ try {
   run('git pull --ff-only', {cwd: '../ether.github.com/'});
   console.log('Committing documentation...');
   run(`cp -R out/doc/ ../ether.github.com/public/doc/v'${newVersion}'`);
-  // pnpm 11 refuses `pnpm version` on a dirty tree (the doc copy above
+  // pnpm refuses `pnpm version` on a dirty tree (the doc copy above
   // dirties it) even with --no-git-tag-version, so write the bump with jq —
   // same pattern used for the etherpad package.json files at the top of
   // this script. The git add+commit below picks up both the bump and the

package.json

@@ -43,14 +43,14 @@
   },
   "engines": {
     "node": ">=24.0.0",
-    "pnpm": ">=11.1.2"
+    "pnpm": ">=12.0.0"
   },
-  "packageManager": "pnpm@11.10.0",
+  "packageManager": "pnpm@12.4.2",
   "repository": {
     "type": "git",
     "url": "https://github.com/ether/etherpad.git"
   },
   "engineStrict": true,
-  "version": "3.3.4",
+  "version": "3.3.5",
   "license": "Apache-2.0"
 }

packaging/README.md

@@ -19,7 +19,7 @@ Built artefacts land in `./dist/`.
 
 ## Building locally
 
-Prereqs: Node 24 (current LTS; matches `engines.node` floor), pnpm 11.1.2+, nfpm.
+Prereqs: Node 24 (current LTS; matches `engines.node` floor), pnpm 12+, nfpm.
 
 ```sh
 pnpm install --frozen-lockfile