Skip to content

Document the UCP business profile route in handleShopifyRoutes - #4158

Merged
kdaviduik merged 1 commit into
mainfrom
steve/document-ucp-profile-route
Oct 24, 2026
Merged

kdaviduik merged 1 commit into
mainfrom
steve/document-ucp-profile-route

Conversation

@SteveSill

Copy link
Copy Markdown
Collaborator

WHY are these changes introduced?

handleShopifyRoutes serves the UCP business profile at /.well-known/ucp through handleUcpProfileProxy, added in #3976. The TSDoc lists the routes the function checks, in order, and it leaves this one out. The shopify.dev reference for Hydrogen 2026-10 renders that TSDoc, so the reference doesn't mention the route.

WHAT is this pull request doing?

  • Adds "the UCP business profile at /.well-known/ucp" to the route list in the handleShopifyRoutes TSDoc. It goes between checkout and cart permalinks and the allowlisted .well-known resources, matching SHOPIFY_ROUTE_INTERCEPTORS.
  • Regenerates packages/hydrogen/docs/generated/generated_docs_data_v2.json with pnpm run build-docs. Apart from the description, the diff is generated symbol IDs, which change on every build.

This changes only docs, so it has no changeset, following #4151.

🤖 Generated with Claude Code

@SteveSill
SteveSill requested a review from a team as a code owner October 9, 2026 03:52
@shopify

shopify Bot commented Oct 9, 2026 •

Copy link
Copy Markdown
Contributor

Oxygen deployed a preview of your steve/document-ucp-profile-route branch. Details:

Storefront Status Preview link Deployment details Last update (UTC)
Skeleton (skeleton.hydrogen.shop) ✅ Successful (Logs) Preview deployment Inspect deployment October 24, 2026 1:49 AM

Learn more about Hydrogen's GitHub integration.

@kdaviduik
kdaviduik changed the base branch from preview to main October 9, 2026 15:59
kdaviduik added a commit that referenced this pull request Oct 17, 2026
…nches

The new version of Hydrogen took over main on 2026-10-09 (a merge of
a rebuilt copy of the preview branch's tree), and classic Hydrogen
moved to the new 2026-04 back-fix branch - but nothing in the repo
documented any of it. Anyone picking a base branch, rebasing, or
porting changes had to reconstruct the layout from git archaeology,
and ~30 retargeted preview-based PRs currently show ~2,800 commits
each because the history rewrite makes a plain rebase impossible.

Add skills/hydrogen-branches as the source of truth:

- Branch map: main = the new version of Hydrogen (framework-
  agnostic), 2026-04 = classic back-fix line, plus the protected
  backup branch, the dead preview branch, and the bot-managed
  dist/dist-preview branches.
- Naming rule: externally the lines are 'the new version of Hydrogen'
  and 'classic Hydrogen' - never 'Hydrogen 3'/'Hydrogen 2'.
- The divergence: the new version descends from June's main, so some
  classic fixes from June-October never reached it; includes a stable
  audit command against the frozen backup branch.
- Git history misleads after the takeover in both directions (classic
  commits appear in git log main without their content; preview SHAs
  are never ancestors of main even when the change landed), and this
  is the cost of the approach that best preserved history on both
  lines rather than force-pushing preview over main or hand-porting
  every divergent fix.
- The rebase recipe for preview-based PRs: git rebase --onto
  origin/main 011651a.
- Shared packages like mini-oxygen are changed and released from main
  only, never from 2026-04.

The skill is symlinked into .agents/skills/ and .claude/skills/,
matching the repo's existing convention, and AGENTS.md gains a short
branch-map pointer plus a Repo Skills section documenting how to add a
new skill. No changeset: repo-local developer guidance, nothing here
ships in @Shopify/hydrogen.

Every factual claim was verified against git, the GitHub API, and npm
by three independent reviewers across three review rounds, with the
rebase recipe proven by running it on real preview-based PR heads
(#4134, #4158, #3874).

Co-authored-by: AI (Pi/GLM 5.3 Fast (Fireworks) [1m]) <noreply@pi.dev>
handleShopifyRoutes serves /.well-known/ucp through handleUcpProfileProxy
(#3976), ahead of the .well-known allowlist. The TSDoc route list left it
out, so the shopify.dev reference didn't mention it.

Co-Authored-By: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
@kdaviduik
kdaviduik force-pushed the steve/document-ucp-profile-route branch from e3e05b5 to 73ce338 Compare October 24, 2026 01:48
@github-actions

Copy link
Copy Markdown
Contributor

We detected some changes in packages/*/package.json or packages/*/src, and there are no updates in the .changeset.
If the changes are user-facing and should cause a version bump, run pnpm run changeset add to track your changes and include them in the next release CHANGELOG.
If you are making simple updates to examples or documentation, you do not need to add a changeset.

@kdaviduik
kdaviduik added this pull request to the merge queue Oct 24, 2026
Merged via the queue into main with commit 5af8a7d Oct 24, 2026
12 checks passed
@kdaviduik
kdaviduik deleted the steve/document-ucp-profile-route branch October 24, 2026 02:24
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants