Skip to content

chore: sync upstream dubinc/dub main into main-staging - #87

Open
github-actions[bot] wants to merge 692 commits into
main-stagingfrom
automation/sync-upstream-main-staging
Open

chore: sync upstream dubinc/dub main into main-staging#87
github-actions[bot] wants to merge 692 commits into
main-stagingfrom
automation/sync-upstream-main-staging

Conversation

@github-actions

@github-actions github-actions Bot commented Sep 7, 2026

Copy link
Copy Markdown

This PR was created by the weekly upstream sync workflow.

It syncs dubinc/dub/main into main-staging using a real merge so upstream commit history is preserved.
Upstream workflow changes are excluded: .github/workflows/ is kept exactly as it is on the staging base. Upstream commits remain in the merge history.
Behind/ahead counts are measured against main, because that is the production/default branch.
It does not auto-merge.

Sync status

  • Fork commits ahead of upstream: 38
  • Upstream commits missing from the fork: 691
  • Compare branch: main at 1881211f943607586882953c7579f7cb4956853d
  • Base branch: main-staging at 4409193c17c9093b38e5b4e02326513e5b1dc92b
  • Upstream branch: dubinc/dub/main at 4b40951c3bbe2d4ac4fff84a0127fbeee8e7c6ad
  • Workflow result: created_with_conflicts_resolved_to_upstream_tree

Merge conflicts

Merge conflicts were detected. The workflow preserved merge ancestry and resolved the sync branch to the upstream tree, while keeping the fork's entire workflow directory and sync helper script.

Conflicted files:

packages/utils/src/constants/main.ts

Review and merge process

  1. Confirm this PR contains upstream commits only; CFA-specific changes should go in a separate PR.
  2. Merge this PR into main-staging with a merge commit. Do not squash or rebase it, otherwise the upstream history will not be preserved.
  3. Test the staging branch after merge.
  4. Promote main-staging to main only after staging looks good.

steven-tey and others added 30 commits August 25, 2026 22:38
Show LTV (`saleAmount`) to partners
The candidate path selects the database route on the trimmed value, so
a pasted " pn_… " or " user@x.com " reached the exact match untrimmed
and found nothing.
The digit sniff could classify a permanent failure as transient when an
ID or count in the message contained 500 or 429. Typed APIError carries
the status; message matching remains only for non-SDK network errors.
Add word-break wrapping to MessageMarkdown and min-w-0 on message
bubbles so long unbroken URLs wrap instead of expanding the layout
on mobile.

Co-authored-by: Steven Tey <steven@dub.co>
pepeladeira and others added 25 commits September 3, 2026 13:32
Co-authored-by: Kiran K <kiran@dub.co>
Co-authored-by: Steven Tey <stevensteel97@gmail.com>
Co-authored-by: Steven Tey <stevensteel97@gmail.com>
…natures (dubinc#4449)

Co-authored-by: Cursor Agent <cursoragent@cursor.com>
Co-authored-by: Steven Tey <stevensteel97@gmail.com>
Co-authored-by: Steven Tey <stevensteel97@gmail.com>
Co-authored-by: Pedro Ladeira <pmladeira@live.com>
Co-authored-by: Steven Tey <stevensteel97@gmail.com>
Co-authored-by: Pedro Ladeira <57876830+pepeladeira@users.noreply.github.com>
Co-authored-by: Kiran K <kiran@dub.co>
Attribute Shopify orders from `note_attributes.dubClickId`
Co-authored-by: Steven Tey <stevensteel97@gmail.com>
Co-authored-by: Steven Tey <stevensteel97@gmail.com>
@vercel

vercel Bot commented Sep 7, 2026

Copy link
Copy Markdown

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

Project Deployment Actions Updated
dub Ready Ready Preview Sep 7, 2026 6:36am UTC

Request Review

…tream-main-staging

# Conflicts:
#	packages/utils/src/constants/main.ts
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.

6 participants