Skip to content

sync integrations/makeswift with canary#3011

Merged
chanceaclark merged 11 commits into
integrations/makeswiftfrom
sync-integrations-makeswift
May 13, 2026
Merged

sync integrations/makeswift with canary#3011
chanceaclark merged 11 commits into
integrations/makeswiftfrom
sync-integrations-makeswift

Conversation

@chanceaclark
Copy link
Copy Markdown
Contributor

Summary

Merges canary into integrations/makeswift to bring the branch up to date.

What came from canary

  • Security patches (#3007): Bumped Next.js (~16.1.6 → ~16.2.6) and React (19.1.5 → 19.1.7) to address CVEs for middleware bypass, SSRF, XSS, cache poisoning, and DoS via OOM/CPU exhaustion
  • Bug fixes: Aligned formField.required with field.required for checkbox-group (#3005); translated Show more/less labels on product compare page (#3009); fixed cart summary Discounts row not showing manual discounts
  • Translation updates (#3008)

Conflict resolutions

  • core/CHANGELOG.md: kept both the makeswift-specific @makeswift/runtime upgrade entry and canary's Next.js/React security patch entry under the 1.6.3 heading (the latest published @bigcommerce/catalyst-makeswift version)
  • pnpm-lock.yaml: accepted canary's version, then regenerated with pnpm install --no-frozen-lockfile

Changeset cleanup

Removed 3 changesets that targeted @bigcommerce/catalyst-core (not @bigcommerce/catalyst-makeswift):

  • cold-foxes-lie.md
  • fix-checkbox-group-required.md
  • translations-patch-580c6ed4.md

Do not squash or rebase-and-merge this PR. Use a true merge commit or rebase locally to preserve the merge base between canary and integrations/makeswift.

chanceaclark and others added 11 commits April 27, 2026 20:31
…3000)

Document the workflow for shipping a single Catalyst package patch ahead of
the normal release cadence, without bundling it with other queued changesets
in the open Version Packages PR. Quarantines other changesets, runs
`changeset version` for the target, hands the publish + canary push back to
the user, and creates the GitHub release manually since the bot's release
flow only fires when CI itself publishes.

Co-authored-by: Claude <noreply@anthropic.com>
…checkbox-group (#3005)

* fix(core): align formField.required with field.required for checkbox-group

* chore: fix prettier formatting

* refactor: use if/else for checkbox-group schema per review
* feat(other): LOCAL-1444 delivery translation

* chore(core): create translations patch

---------

Co-authored-by: bc-svc-local <bc-svc-local@users.noreply.github.com>
…r security patches (#3007)

Addresses multiple CVEs disclosed May 2026:

- next: ~16.1.6 → ~16.2.6 (middleware bypass, SSRF, XSS, cache poisoning)
- react/react-dom: 19.1.5 → 19.1.7 (GHSA-rv78-f8rc-xrxh DoS via OOM/CPU on server function endpoints)
- @opennextjs/cloudflare: 1.17.3 → 1.19.9 in native-hosting workflow

eslint-config-next intentionally left at 15.5.10 — @16.x requires ESLint 9+/flat config migration.

Fixes TRAC-668

Co-authored-by: Claude <noreply@anthropic.com>
…akeswift

# Conflicts:
#	core/CHANGELOG.md
#	pnpm-lock.yaml
@chanceaclark chanceaclark requested a review from a team as a code owner May 13, 2026 17:54
@changeset-bot
Copy link
Copy Markdown

changeset-bot Bot commented May 13, 2026

⚠️ No Changeset found

Latest commit: 3048ec2

Merging this PR will not cause a version bump for any packages. If these changes should not result in a new version, you're good to go. If these changes should result in a version bump, you need to add a changeset.

This PR includes no changesets

When changesets are added to this PR, you'll see the packages that this PR includes changesets for and the associated semver types

Click here to learn what changesets are, and how to add one.

Click here if you're a maintainer who wants to add a changeset to this PR

@vercel
Copy link
Copy Markdown

vercel Bot commented May 13, 2026

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

Project Deployment Actions Updated (UTC)
catalyst Ready Ready Preview, Comment May 13, 2026 5:55pm

Request Review

@github-actions
Copy link
Copy Markdown
Contributor

Bundle Size Report

Comparing against baseline from 9dff9d8 (2026-05-13).

Metric Baseline Current Delta
First Load JS 118.6 kB 129.6 kB +11 kB (+9.3%) ⚠️
Total JS 698.1 kB 695 kB -3.1 kB (-0.4%)

Per-Route First Load JS

Route Baseline Current Delta
/(default)/(auth)/change-password/page 598.5 kB 608.4 kB +9.9 kB (+1.7%)
/(default)/(auth)/login/forgot-password/page 597.6 kB 607.5 kB +9.9 kB (+1.7%)
/(default)/(auth)/login/page 598.2 kB 608.1 kB +9.9 kB (+1.7%)
/(default)/(auth)/register/page 599.6 kB 609.5 kB +9.9 kB (+1.7%)
/(default)/(faceted)/brand/[slug]/page 604.5 kB 614.3 kB +9.8 kB (+1.6%)
/(default)/(faceted)/category/[slug]/page 612.7 kB 622.5 kB +9.8 kB (+1.6%)
/(default)/(faceted)/search/page 604.5 kB 614.3 kB +9.8 kB (+1.6%)
/(default)/[...rest]/page 599.6 kB 609.5 kB +9.9 kB (+1.7%)
/(default)/account/addresses/page 602.1 kB 612 kB +9.9 kB (+1.6%)
/(default)/account/orders/[id]/page 597.3 kB 607.1 kB +9.8 kB (+1.6%)
/(default)/account/orders/page 598.2 kB 608 kB +9.8 kB (+1.6%)
/(default)/account/settings/page 601.6 kB 611.5 kB +9.9 kB (+1.6%)
/(default)/account/wishlists/[id]/page 606.9 kB 616.7 kB +9.8 kB (+1.6%)
/(default)/account/wishlists/page 601.6 kB 611.5 kB +9.9 kB (+1.6%)
/(default)/blog/[blogId]/page 599.6 kB 609.5 kB +9.9 kB (+1.7%)
/(default)/blog/page 600.4 kB 610.2 kB +9.8 kB (+1.6%)
/(default)/cart/page 606.2 kB 616.1 kB +9.9 kB (+1.6%)
/(default)/compare/page 600.9 kB 610.8 kB +9.9 kB (+1.6%)
/(default)/gift-certificates/balance/page 601.4 kB 611.3 kB +9.9 kB (+1.6%)
/(default)/gift-certificates/page 599.6 kB 609.5 kB +9.9 kB (+1.7%)
/(default)/gift-certificates/purchase/page 601.3 kB 611.2 kB +9.9 kB (+1.6%)
/(default)/page 599.6 kB 609.5 kB +9.9 kB (+1.7%)
/(default)/product/[slug]/page 612.7 kB 622.5 kB +9.8 kB (+1.6%)
/(default)/webpages/[id]/contact/page 602.8 kB 612.6 kB +9.8 kB (+1.6%)
/(default)/webpages/[id]/normal/page 600.1 kB 610 kB +9.9 kB (+1.6%)
/(default)/wishlist/[token]/page 603.6 kB 613.5 kB +9.9 kB (+1.6%)
/maintenance/page 596.2 kB 606 kB +9.8 kB (+1.6%)
/_global-error/page 126.2 kB 143.8 kB +17.6 kB (+13.9%) ⚠️
/_not-found/page 550.4 kB 560.6 kB +10.2 kB (+1.9%)

Threshold: 5% increase. Routes with ⚠️ exceed the threshold.

@github-actions
Copy link
Copy Markdown
Contributor

github-actions Bot commented May 13, 2026

Unlighthouse Performance Comparison — Vercel

Comparing PR preview deployment Unlighthouse scores vs production Unlighthouse scores.

Summary Score

Aggregate score across all categories as reported by Unlighthouse.

Prod Desktop Prod Mobile Preview Desktop Preview Mobile
Score 88 91 90 92

Category Scores

Category Prod Desktop Prod Mobile Preview Desktop Preview Mobile
Performance 68 97 69 79
Accessibility 91 91 91 95
Best Practices 95 100 95 100
SEO 89 89 100 89

Core Web Vitals

Metric Prod Desktop Prod Mobile Preview Desktop Preview Mobile
LCP 5.5 s 2.6 s 5.4 s 5.8 s
CLS 0.001 0 0.001 0
FCP 1.2 s 1.1 s 1.1 s 1.2 s
TBT 20 ms 30 ms 20 ms 40 ms
Max Potential FID 80 ms 110 ms 80 ms 80 ms
Time to Interactive 6.8 s 6.3 s 6.8 s 5.8 s

Full Unlighthouse report →

@chanceaclark chanceaclark merged commit 3048ec2 into integrations/makeswift May 13, 2026
19 of 20 checks passed
@chanceaclark chanceaclark deleted the sync-integrations-makeswift branch May 13, 2026 20:29
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.

7 participants