Skip to content

chore: unify the repo on the next branch#1454

Merged
franky47 merged 10 commits into
nextfrom
chore/branch-simplification
Jun 27, 2026
Merged

chore: unify the repo on the next branch#1454
franky47 merged 10 commits into
nextfrom
chore/branch-simplification

Conversation

@franky47

@franky47 franky47 commented Jun 26, 2026

Copy link
Copy Markdown
Member

Why

nuqs.dev deploys from master, but all development lands on next. The two branches exist for one reason: keeping docs for unreleased features out of production until they ship on npm. The beta branch is a related leftover, no longer used for publishing now that releases run through the draft/validate/finalize workflow.

The split is expensive. Every docs-only change (sponsors, dependency bumps, copy fixes) gets cherry-picked between branches. They drift, and we end up maintaining two sources of truth. They've been diverged for about 3.5 months.

This PR removes the reasons to keep master and beta around, so the repo can run from next alone.

Docs: gate unreleased content

Wrap unreleased content in <SinceVersion v="2.9.0">. In production it stays hidden until npm's latest dist-tag reaches that version. The published version comes from one build-time fetch, frozen per deploy, so revealing GA docs is one redeploy away.

Preview and local builds render everything, with a visual cue marking what isn't live yet. So unreleased docs are reviewable on a preview URL before they ship.

The same gate runs over the llms.txt / .md outputs and the FeatureSupportMatrix version lines, so the HTML docs and the LLM docs stay in sync.

Today this gates the React Router v8 adapter and the history default option, both slated for 2.9.0.

CI: drop the retired branches

  • ci-cd.yml no longer runs on pushes to master or beta, only next and PRs. Neither branch sourced npm publishes anymore.
  • Removed pr-base-enforcement.yml, which only existed to close PRs targeting master.

Out of scope (follow-ups)

  • Back-porting the remaining master-only docs tweaks to next before the cutover.
  • The Vercel cutover: point production at next, then retire master.
  • An optional GA-triggered redeploy hook so 2.9.0 docs reveal automatically on release.

nuqs.dev deploys from `master` only to keep unreleased-feature docs out of
production. Gating that content inline by the published npm version lets
`next` become the single deploy source and ends the cherry-pick churn
between branches.
@franky47 franky47 added this to the 🪵 Backlog milestone Jun 26, 2026
@franky47 franky47 added documentation Improvements or additions to documentation internal Internal issues & discussions labels Jun 26, 2026
@vercel

vercel Bot commented Jun 26, 2026

Copy link
Copy Markdown

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

Project Deployment Actions Updated (UTC)
nuqs Ready Ready Preview, Comment Jun 27, 2026 9:22pm

@franky47 franky47 added the internal Internal issues & discussions label Jun 26, 2026
@coderabbitai

coderabbitai Bot commented Jun 26, 2026

Copy link
Copy Markdown

Important

Review skipped

Auto reviews are disabled on this repository. Please check the settings in the CodeRabbit UI or the .coderabbit.yaml file in this repository. To trigger a single review, invoke the @coderabbitai review command.

⚙️ Run configuration

Configuration used: Organization UI

Review profile: CHILL

Plan: Pro Plus

Run ID: 72e5daaf-4a9f-4d99-98fd-69dedaa753b4

You can disable this status message by setting the reviews.review_status to false in the CodeRabbit configuration file.

Use the checkbox below for a quick retry:

  • 🔍 Trigger review

Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out.

❤️ Share

Comment @coderabbitai help to get the list of available commands.

MDX components are wired through `mdx-components` and resolved at runtime,
so Knip can't trace their usage and flags the export as unused. List it
alongside the sibling audience and feature-support-matrix entries.
@franky47 franky47 marked this pull request as ready for review June 26, 2026 18:45
franky47 added 2 commits June 26, 2026 23:03
Neither branch sources npm publishes anymore (handled by the
draft/validate/finalize workflow dispatched from `next`), so running the
CI matrix on pushes to them is dead config. `next` and PRs still run it.
It auto-closed any PR targeting `master`; with `master` retired there are no such PRs left to guard against.
@coderabbitai

coderabbitai Bot commented Jun 26, 2026

Copy link
Copy Markdown

Caution

Failed to replace (edit) comment. This is likely due to insufficient permissions or the comment being deleted.

Error details
{}

@franky47 franky47 changed the title doc: version-gate unreleased content so production deploys from next chore: unify the repo on the next branch Jun 26, 2026
@franky47 franky47 merged commit 6a6a1cb into next Jun 27, 2026
34 checks passed
@franky47 franky47 deleted the chore/branch-simplification branch June 27, 2026 21:24
@github-actions github-actions Bot removed this from the 🪵 Backlog milestone Jun 27, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

documentation Improvements or additions to documentation internal Internal issues & discussions

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant