revert: retire pnpm@10.30.2 pin (PRs #22 + #28) — fixed upstream in v1.3.1#38
Merged
Merged
Conversation
This reverts commit 6357bb2.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
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.
apps/web/Dockerfile.web(builder stage).apps/admin,apps/live,apps/space(builder + installer stages).Why retire the pins
PR #28's commit message captured the original bug:
corepack enablewithout an explicit version resolved pnpm from the workspace'spackageManagerfield (11.x), which moved the global bin to$PNPM_HOME/bin, breakingpnpm add -gin each builder stage.Upstream's release branch fixed this by aligning the workspace
packageManagerdeclaration with the builder-stage layout. The four Dockerfiles in v1.3.1 use plaincorepack enable pnpm(or nocorepackline at all) and resolve to apnpm add -gthat works. Verified empirically onsync/upstream-1.3.1(the merge that brought v1.3.1 in): with the pin removed from all four Dockerfiles, all fourmake 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:
corepack prepare pnpm@10.30.2 --activateprefix (the pin — revert's intent).turbo@2.9.4bump (don't undo PR Sync foss-main with upstream Plane v1.3.1 #36).End-state is exactly the upstream v1.3.1 form for the four
pnpm/turbolines.What's preserved
The reverts do not touch any other Pressingly customization. In particular,
apps/web/Dockerfile.webretains its Pressingly-added SSOARG/ENVdeclarations (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(notfoss-main) because the underlying bug isn't fixed onfoss-mainyet — the fix arrives via the v1.3.1 merge in PR #36. Once #36 lands, this PR can be retargeted tofoss-mainor fast-forwarded along.Test plan
make dev.build.plane.web→ exit 0make dev.build.plane.admin→ exit 0make dev.build.plane.space→ exit 0make dev.build.plane.live→ exit 0apps/web/Dockerfile.web(8 sentinel matches)