Skip to content

revert: retire pnpm@10.30.2 pin (PRs #22 + #28) — fixed upstream in v1.3.1#38

Merged
hunzlahmalik merged 2 commits into
sync/upstream-1.3.1from
revert/pnpm-pin-prs-22-28
May 20, 2026
Merged

revert: retire pnpm@10.30.2 pin (PRs #22 + #28) — fixed upstream in v1.3.1#38
hunzlahmalik merged 2 commits into
sync/upstream-1.3.1from
revert/pnpm-pin-prs-22-28

Conversation

@hunzlahmalik
Copy link
Copy Markdown

Summary

Reverts the two pnpm@10.30.2 pin PRs now that upstream Plane v1.3.1 has fixed the underlying bug that motivated them.

Why retire the pins

PR #28's commit message captured the original bug: corepack enable without an explicit version resolved pnpm from the workspace's packageManager field (11.x), which moved the global bin to $PNPM_HOME/bin, breaking pnpm add -g in each builder stage.

Upstream's release branch fixed this by aligning the workspace packageManager declaration with the builder-stage layout. The four Dockerfiles in v1.3.1 use plain corepack enable pnpm (or no corepack line at all) and resolve to a pnpm add -g that works. Verified empirically on sync/upstream-1.3.1 (the merge that brought v1.3.1 in): with the pin removed from all four Dockerfiles, all four make dev.build.plane.{web,admin,space,live} builds completed cleanly (each exit 0).

Resolution detail

Both reverts hit merge conflicts because the v1.3.1 merge in PR #36 also touched the same lines (turbo bump). Resolved each conflict by:

End-state is exactly the upstream v1.3.1 form for the four pnpm/turbo lines.

What's preserved

The reverts do not touch any other Pressingly customization. In particular, apps/web/Dockerfile.web retains its Pressingly-added SSO ARG/ENV declarations (VITE_OAUTH2_PROXY_BASE_PATH, VITE_OIDC_LOGOUT_URL, VITE_OIDC_CLIENT_ID, VITE_LOGOUT_REDIRECT_URL, VITE_AUTH_TYPE) — those were added by a different PR and are unrelated to the pnpm-pin question.

Base branch

Targets sync/upstream-1.3.1 (not foss-main) because the underlying bug isn't fixed on foss-main yet — the fix arrives via the v1.3.1 merge in PR #36. Once #36 lands, this PR can be retargeted to foss-main or fast-forwarded along.

Test plan

  • make dev.build.plane.web → exit 0
  • make dev.build.plane.admin → exit 0
  • make dev.build.plane.space → exit 0
  • make dev.build.plane.live → exit 0
  • VITE_* SSO env vars still present in apps/web/Dockerfile.web (8 sentinel matches)
  • Smoke test the resulting images against the devstack (SSO login still works)

@hunzlahmalik hunzlahmalik merged commit 0a315be into sync/upstream-1.3.1 May 20, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant