Skip to content

chore: sync upstream dubinc/dub to 2026-07-16 - #69

Open
VinneyJ wants to merge 4 commits into
mainfrom
chore/sync-upstream-jul-2026-v2
Open

chore: sync upstream dubinc/dub to 2026-07-16#69
VinneyJ wants to merge 4 commits into
mainfrom
chore/sync-upstream-jul-2026-v2

Conversation

@VinneyJ

@VinneyJ VinneyJ commented Aug 10, 2026

Copy link
Copy Markdown

Summary

  • Syncs upstream dubinc/dub at commit 1dfc9fe373 (2026-07-16)
  • Applies all upstream changes in a single clean commit
  • Carries forward existing CFA customizations from develop

CFA-specific changes included

  • Hostnames: Added app.fyi.codeforafrica.org and dub.dev.codeforafrica.org to APP_HOSTNAMES so middleware routes them correctly
  • Cookie domain: Made session cookie domain configurable via NEXTAUTH_COOKIE_DOMAIN env var (CFA uses .codeforafrica.org)
  • Resend config: RESEND_FROM and RESEND_REPLY_TO remain env-configurable
  • Signups: Registration disabled, /register redirects to /login
  • Self-hosting docs: CFA self-hosting and upgrade guides preserved

Replaces

Replaces PR #66 which had the same changes but with a noisy commit history.

Test plan

  • Auth flow works (login, session cookie uses correct domain)
  • /register redirects to /login
  • App loads on app.fyi.codeforafrica.org
  • Vercel preview deployment passes

- Sync upstream dubinc/dub at commit 1dfc9fe (2026-07-16)
- Add CFA hostnames (app.fyi.codeforafrica.org, dub.dev.codeforafrica.org)
- Make session cookie domain configurable via NEXTAUTH_COOKIE_DOMAIN env var
- Keep existing CFA customizations (Resend config, disable signups, self-hosting docs)
@vercel

vercel Bot commented Aug 10, 2026

Copy link
Copy Markdown

The latest updates on your projects. Learn more about Vercel for GitHub.

Project Deployment Actions Updated (UTC)
dub Ready Ready Preview Aug 10, 2026 12:35pm

Request Review

@kilemensi

kilemensi commented Aug 10, 2026

Copy link
Copy Markdown
Member

The right approach @VinneyJ is:

  1. 1st PR pulls in changes from upstream without any changes. This makes it an almost automatic merge.
  2. 2nd PR, built on top of 1st PR, fixes any issues raised or that would be raised by merging the 1st PR (if any). This requires manual human review and in those cases where there are no breaking changes, the 2nd PR is usually not needed.

This approach ensures 2nd PR is small enough to be human-reviewable. It's impossible for someone to review a 3000+ files PR hunting down for a few changes that were made by hand.

Having said that, we're almost at the end of 2/3rd Sprint working on this so lets merge it (if all our tests, automated and manual, pass).

@VinneyJ

VinneyJ commented Aug 10, 2026

Copy link
Copy Markdown
Author

Hey @kilemensi, thank you for the feedback. That makes a lot of sense. I'll make sure the next sync follows that PR approach you've recommended so it's easy to isolate and review.

For now, the Vercel preview is failing because the database credentials changed (I created a new PlanetScale DB branch). I'm updating the env vars now once the db branch finishes to initialize and will retrigger the build. Once that's green, I'll ping you for a final check.

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.

2 participants