[docs] Restore minimal Next.js placeholder on stable#1786
Merged
VaguelySerious merged 2 commits intostablefrom Apr 16, 2026
Merged
[docs] Restore minimal Next.js placeholder on stable#1786VaguelySerious merged 2 commits intostablefrom
VaguelySerious merged 2 commits intostablefrom
Conversation
The `docs/` Next.js app was removed from `stable` in #1771 to eliminate cherry-pick conflicts during backports. That also disabled the `Vercel – workflow-docs` deploy check (it fails with "No Next.js version detected") and removed the per-deployment SDK tarballs that we use for pre-release testing on backport PRs. This restores a minimal placeholder: - `docs/package.json` with only `next`, `react`, `react-dom` and their types — no docs content, no fumadocs, no AI chat, no OG, nothing. - A single home page with a pointer to workflow-sdk.dev. - The `scripts/pack.ts` prebuild from `main` unchanged, so `/<pkg>.tgz` URLs keep working under the preview deployment. The backport workflow's existing rule (#1770) that deletes any `docs/*` (outside `docs/content/`) conflict still applies — these files are treated as disposable on stable. If a backport ever deletes them, it's safe to restore this placeholder in a follow-up. Signed-off-by: Peter Wielander <[email protected]>
Contributor
🦋 Changeset detectedLatest commit: 88a27ae The changes in this PR will be included in the next version bump. This PR includes changesets to release 0 packagesWhen changesets are added to this PR, you'll see the packages that this PR includes changesets for and the associated semver types Not sure what this means? Click here to learn what changesets are. Click here if you're a maintainer who wants to add another changeset to this PR |
Contributor
🧪 E2E Test Results❌ Some tests failed Summary
❌ Failed Tests📦 Local Production (1 failed)sveltekit-stable (1 failed):
🌍 Community Worlds (83 failed)mongodb (11 failed):
redis (7 failed):
turso (65 failed):
Details by Category✅ ▲ Vercel Production
✅ 💻 Local Development
❌ 📦 Local Production
✅ 🐘 Local Postgres
✅ 🪟 Windows
❌ 🌍 Community Worlds
✅ 📋 Other
❌ Some E2E test jobs failed:
Check the workflow run for details. |
Using `^19.2.1` / `^19.2.7` on `react` and `@types/react` hoisted a different `@types/react` alongside the existing `19.1.13`, which broke `workbench/nextjs-turbopack`'s type check because component props from the two versions weren't assignable (`Key` diverges between 19.1 and 19.2). Pin to the same versions the rest of the workspace resolves to so the lockfile only adds the `docs` importer entry. Signed-off-by: Peter Wielander <[email protected]>
TooTallNate
approved these changes
Apr 16, 2026
TooTallNate
added a commit
that referenced
this pull request
Apr 17, 2026
After #1786 restored a minimal Next.js placeholder docs app on stable, docs app conflicts should resolve to the stable branch version rather than being deleted. Only docs/content/ is actively maintained on stable, so conflicts there should still be resolved normally. Update both the auto-resolution logic in backport.yml and the AI prompt to reflect the new policy, and update AGENTS.md to match.
TooTallNate
added a commit
that referenced
this pull request
Apr 17, 2026
) * Prefer stable version for docs app conflicts in backport workflow After #1786 restored a minimal Next.js placeholder docs app on stable, docs app conflicts should resolve to the stable branch version rather than being deleted. Only docs/content/ is actively maintained on stable, so conflicts there should still be resolved normally. Update both the auto-resolution logic in backport.yml and the AI prompt to reflect the new policy, and update AGENTS.md to match. * Use git show :2:$file to detect ours-side presence in conflicts git ls-files --error-unmatch succeeds for unmerged paths even when the file only exists on the incoming (theirs) side, which would then fail on git checkout --ours. Use git show :2:$file to specifically check for a stage-2 entry, which indicates the file exists on the ours (stable) side.
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
2 participants
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
docs/Next.js app onstableso theVercel – workflow-docsdeploy check on PRs succeeds. Since Remove docs app from stable branch, keep docs/content/ for npm releases #1771 the check has been failing with "No Next.js version detected" because the Vercel project hasdocs/configured as its root directory.prebuildtarball pack script, so preview deployments continue to publish per-SDK package tarballs at/<pkg>.tgz, which is what we instruct users to install for pre-release testing on backport PRs.Scope
The placeholder is as minimal as possible:
docs/package.jsonwith onlynext,react,react-domand their types. No fumadocs, no AI chat, no OG images, no home-page components, no docs content.app/page.tsx) with a pointer to workflow-sdk.dev.docs/scripts/pack.tscopied verbatim frommain.docsre-added topnpm-workspace.yamland the.changeset/config.jsonignore list.Interaction with the backport workflow
#1770's rule to auto-delete any cherry-pick conflict under
docs/(outsidedocs/content/) is unchanged and still the intended behavior. The files introduced here are treated as disposable onstable— if a future backport deletes them, we can restore this placeholder in a follow-up. They're small and self-contained, so conflicts frommainshould be rare.Verification
Locally:
pnpm installsucceeds.pnpm --filter docs buildsucceeds, producing 26*.tgztarballs indocs/public/.The
Vercel – workflow-docscheck should now returnsuccesson this PR — holding as draft until confirmed.