sync: TRAC-1236 sync integrations/b2b-makeswift with integrations/makeswift@1.10.0 - #3153
Merged
chanceaclark merged 14 commits intoJul 30, 2026
Merged
Conversation
…age (#3108) * feat(promotions): PROMO-1574 add featured promotions callout on homepage * feat(promotions): PROMO-1574 resolve moreOffers label inline in productCard
…#3115) The `Complete Linear release` step passed `version` to linear-release-action`s `complete`, which looks up an existing release with that exact version. The `catalyst-release` pipeline is a scheduled pipeline whose started release is unversioned (the accumulating `sync` steps run without a version), so the lookup never matched and the step failed on every publish with `No release found with version "..."` — on both canary (catalyst-core) and integrations/makeswift (catalyst-makeswift). Drop the `version` input so `complete` finalizes the latest started release, i.e. the one `sync` has been accumulating into. Release notes are still fetched by tag and passed through. Refs LTRAC-1265 Co-authored-by: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
* TRAC-1250: Add additional scopes missing from CLI create command * TRAC-1250: Add changeset
…akeswift # Conflicts: # core/app/[locale]/(default)/page.tsx # core/package.json
…etch (#3112) * TRAC-1161: fix - Set request locale in generateMetadata before data fetch generateMetadata runs before the page body and fetches page data via cache()-memoized loaders without first calling setRequestLocale. During ISR regeneration there is no request, so next-intl getServerLocale() returns undefined, the storefront client omits Accept-Language, and BigCommerce serves default-locale content that poisons the memoized cache for the whole render. Call setRequestLocale(locale) before the fetch in each generateMetadata. Fixes TRAC-1161 * TRAC-1161: chore - Add changeset for locale metadata fix
…wift (#3126) Add integrations/b2b-makeswift to the Changesets Release workflow so the branch can cut its own @bigcommerce/catalyst-b2b-makeswift releases: - Trigger the workflow on pushes to integrations/b2b-makeswift. - Map that branch to @bigcommerce/catalyst-b2b-makeswift when resolving the headline package for the Linear release notes. Both additions are inert on canary and integrations/makeswift: a push only runs the workflow copy on the branch that was pushed, and the headline elif never matches their ref_name. Keeping this on canary makes it the source of truth for the shared workflow; integrations/makeswift picks it up via /sync-makeswift and integrations/b2b-makeswift carries the same file. Refs TRAC-1235 Co-authored-by: Claude <noreply@anthropic.com>
* build: TRAC-1250 Bump next from 16.2.6 to 16.2.11 Patches the July 2026 Next.js security release (https://nextjs.org/blog/july-2026-security-release). Also updates pnpm-lock.yaml and adds a changeset. Fixes TRAC-1250 Co-Authored-By: Claude <noreply@anthropic.com> * test: increase upgrade test timeout to 300 s for Windows CI runners * Revert "test: increase upgrade test timeout to 300 s for Windows CI runners" This reverts commit fd124cd. --------- Co-authored-by: Claude <noreply@anthropic.com> Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com>
…omotion callouts using built-in styles (#3128)
…akeswift # Conflicts: # core/CHANGELOG.md # core/package.json # pnpm-lock.yaml
* Version Packages (`integrations/makeswift`) * chore: trigger CI --------- Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: Chancellor Clark <chancellor.clark@bigcommerce.com>
…ions-b2b-makeswift @bigcommerce/catalyst-makeswift@1.10.0 # Conflicts: # core/package.json
|
The latest updates on your projects. Learn more about Vercel for GitHub.
|
🦋 Changeset detectedLatest commit: 7f0cf98 The changes in this PR will be included in the next version bump. This PR includes changesets to release 1 package
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
Bundle Size ReportComparing against baseline from
Per-Route First Load JS
|
Contributor
Author
|
parthshahp
approved these changes
Jul 30, 2026
chanceaclark
merged commit Jul 30, 2026
7f0cf98
into
integrations/b2b-makeswift
16 of 18 checks passed
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
6 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.
Jira: TRAC-1236
What/Why?
Rung 9 of 9, and the last one, in the makeswift catch-up climb (LTRAC-1297):
1.9.0 → 1.10.0(13 commits). Confirmed1.10.0is exactly makeswift's current HEAD, so there's no further catch-up needed after this lands. Once this merges and releases, LTRAC-1297 and the whole b2b-makeswift consolidation climb (LTRAC-1095) close out.Small final rung, only one conflict.
Same
package.json/CHANGELOG.mdsilent auto-merge, caught again (7th and final occurrence of the whole climb): the top-levelversion/nestedcatalystblock got a duplicated/wrong makeswift-own value inserted (same pattern as rungs 7-8), reverted to b2b's actual1.9.0.CHANGELOG.mdhad makeswift's own historical entries pasted in, reverted to ours. Full diff-check onpackage.jsonconfirmed nothing else changed beyond legitimate dependency bumps (nextpatch,storefront-kitminor).Release-wiring guardrail note (informational only, not acted on): confirmed makeswift@1.10.0's
changesets-release.ymlfinally is b2b-aware upstream — but the file wasn't touched/conflicted by this specific merge, so b2b's own already-correct copy just carried through unchanged either way.Confirmed the whole B2B surface (
register/route.tsredirect,withB2Bproxy wiring,core/b2b/*) survived intact.Added
.changeset/sync-makeswift-1-10-0.mdfor this rung's own bump.Rollout/Rollback
Internal upgrade branch, no runtime/customer impact until eventually released and adopted. Rollback = revert the merge commit.
Do not squash or rebase-and-merge this PR. Use a true merge commit to preserve the merge base between
integrations/makeswiftandintegrations/b2b-makeswift.Testing
pnpm install --no-frozen-lockfileclean (Node 24).pnpm --filter @bigcommerce/catalyst-b2b-makeswift typecheck— clean (0 errors).pnpm --filter @bigcommerce/catalyst-b2b-makeswift lint— clean (0 errors, 0 warnings).core/package.jsonre-validated as valid JSON with a singlecatalystkey.