sync integrations/makeswift with canary#3130
Merged
chanceaclark merged 6 commits intoJul 23, 2026
Merged
Conversation
…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)
🦋 Changeset detectedLatest commit: 475b35c 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 |
|
The latest updates on your projects. Learn more about Vercel for GitHub.
|
Contributor
Bundle Size ReportComparing against baseline from No bundle size changes detected. |
…akeswift # Conflicts: # core/CHANGELOG.md # core/package.json # pnpm-lock.yaml
chanceaclark
force-pushed
the
sync-integrations-makeswift
branch
from
July 23, 2026 21:40
3f61b44 to
475b35c
Compare
parthshahp
approved these changes
Jul 23, 2026
Contributor
Unlighthouse Performance Comparison — VercelComparing PR preview deployment Unlighthouse scores vs production Unlighthouse scores. Summary ScoreAggregate score across all categories as reported by Unlighthouse.
Category Scores
Core Web Vitals
|
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
4 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
Syncs
integrations/makeswiftwith the latestcanary(through the@bigcommerce/catalyst-core@1.10.1release), and adds a changeset to release@bigcommerce/catalyst-makeswift(patch).Notable changes pulled in from canary:
@bigcommerce/catalyst-core@1.10.1: fix for product/category/brand metadata falling back to the default locale after ISR revalidation (TRAC-1161: fix - Set request locale in generateMetadata before data fetch #3112); style promotion callouts with Storefront Kit's built-inwarningvariant and bumpstorefront-kitto^0.32.3(chore(deps): PROMO-1574 bump storefront-kit versions and style the promotion callouts #3128); bump Next.js to16.2.11for the July 2026 security release (build: TRAC-1250 Bump next from 16.2.6 to 16.2.11 #3129)integrations/b2b-makeswift(ci: TRAC-1235 make changesets release aware of integrations/b2b-makeswift #3126)Conflict resolutions
core/package.json: keptnameas@bigcommerce/catalyst-makeswiftandversionat1.9.0(latest published makeswift version); kept the makeswift-onlyswrdependency; took canary'sstorefront-kitbump to^0.32.3.core/package.jsoncatalyst.version/catalyst.ref: these must mirror the package's own name/version (1.9.0/@bigcommerce/catalyst-makeswift@1.9.0), not canary's. The merge auto-took canary's raw value here (@bigcommerce/catalyst-core@1.10.1) since this nested field wasn't a textual conflict; corrected by hand. This same bug is present on the currentintegrations/makeswifttip from the prior sync merge — this PR's merge commit supersedes it.core/CHANGELOG.md: removed the raw## 1.10.1/## 1.10.0sections copied from canary's changelog — the new sync changeset will generate the correct combined entry when this release is versioned.pnpm-lock.yaml: took canary's lockfile and regenerated withpnpm install --no-frozen-lockfileto account for the makeswift-specificpackage.jsondifferences.Test plan