Skip to content

sync integrations/makeswift with canary#2954

Merged
jorgemoya merged 4 commits intointegrations/makeswiftfrom
sync-integrations-makeswift
Mar 25, 2026
Merged

sync integrations/makeswift with canary#2954
jorgemoya merged 4 commits intointegrations/makeswiftfrom
sync-integrations-makeswift

Conversation

@jorgemoya
Copy link
Copy Markdown
Contributor

@jorgemoya jorgemoya commented Mar 25, 2026

Summary

  • Syncs integrations/makeswift with canary to pull in @bigcommerce/catalyst-core@1.6.2 changes
  • Root-level not-found page fix (fix(core): adds root-level not found page #2947): app/layout.tsx now holds html/body tags, [locale]/layout.tsx uses a fragment — makeswift's MakeswiftProvider, SiteTheme, and getSiteVersion() were moved to app/layout.tsx
  • Translation updates (Update translations #2945)

Conflict resolutions

  • core/app/layout.tsx — new file from canary; added makeswift-specific wrapping (MakeswiftProvider, SiteTheme, getSiteVersion, makeswift component registration)
  • core/app/[locale]/layout.tsx — adopted canary's fragment pattern, removed makeswift imports that moved to app/layout.tsx
  • core/CHANGELOG.md — used makeswift "Pulls in changes from core@1.6.2" format

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.

bc-svc-local and others added 4 commits March 23, 2026 14:28
@bc-svc-local
Update translations (#2945)
4479964 
* feat(other): LOCAL-1444 delivery translation

* chore(core): create translations patch

---------

Co-authored-by: bc-svc-local <bc-svc-local@users.noreply.github.com>
@jorgemoya
fix(core): adds root-level not found page (#2947)
e198d89
@github-actions
Version Packages (canary) (#2946)
30ac2ab 
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
@jorgemoya
Merge remote-tracking branch 'origin/canary' into sync-integrations-m…
04224f4 
…akeswift

# Conflicts:
#	core/CHANGELOG.md
#	core/app/[locale]/layout.tsx
@jorgemoya jorgemoya requested a review from a team as a code owner March 25, 2026 18:23
@changeset-bot
Copy link
Copy Markdown

changeset-bot Bot commented Mar 25, 2026

⚠️ No Changeset found

Latest commit: 04224f4

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 Mar 25, 2026 •
edited
Loading

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

Project Deployment Actions Updated (UTC)
catalyst Ready Ready Preview, Comment Mar 26, 2026 6:43pm

Request Review

@github-actions
Copy link
Copy Markdown
Contributor

github-actions Bot commented Mar 25, 2026

Bundle Size Report

Comparing against baseline from 66d2a7d (2026-03-25).

Metric Baseline Current Delta
Total JS 591 kB 592.1 kB +1.1 kB (+0.2%)

Per-Route First Load JS

Route Baseline Current Delta
/(default)/(auth)/change-password/page 598.6 kB 599.8 kB +1.2 kB (+0.2%)
/(default)/(auth)/login/forgot-password/page 597.8 kB 598.9 kB +1.1 kB (+0.2%)
/(default)/(auth)/login/page 598.4 kB 599.5 kB +1.1 kB (+0.2%)
/(default)/(auth)/register/page 599.8 kB 600.9 kB +1.1 kB (+0.2%)
/(default)/(faceted)/brand/[slug]/page 604.6 kB 605.7 kB +1.1 kB (+0.2%)
/(default)/(faceted)/category/[slug]/page 612.8 kB 614 kB +1.2 kB (+0.2%)
/(default)/(faceted)/search/page 604.6 kB 605.7 kB +1.1 kB (+0.2%)
/(default)/[...rest]/page 599.8 kB 600.9 kB +1.1 kB (+0.2%)
/(default)/account/addresses/page 602.3 kB 603.4 kB +1.1 kB (+0.2%)
/(default)/account/orders/[id]/page 597.4 kB 598.5 kB +1.1 kB (+0.2%)
/(default)/account/orders/page 598.3 kB 599.4 kB +1.1 kB (+0.2%)
/(default)/account/settings/page 601.8 kB 602.9 kB +1.1 kB (+0.2%)
/(default)/account/wishlists/[id]/page 607 kB 608.1 kB +1.1 kB (+0.2%)
/(default)/account/wishlists/page 601.7 kB 602.9 kB +1.2 kB (+0.2%)
/(default)/blog/[blogId]/page 599.8 kB 600.9 kB +1.1 kB (+0.2%)
/(default)/blog/page 600.5 kB 601.6 kB +1.1 kB (+0.2%)
/(default)/cart/page 606.4 kB 607.5 kB +1.1 kB (+0.2%)
/(default)/compare/page 601.1 kB 602.2 kB +1.1 kB (+0.2%)
/(default)/gift-certificates/balance/page 601.6 kB 602.7 kB +1.1 kB (+0.2%)
/(default)/gift-certificates/page 599.8 kB 600.9 kB +1.1 kB (+0.2%)
/(default)/gift-certificates/purchase/page 601.5 kB 602.6 kB +1.1 kB (+0.2%)
/(default)/page 599.8 kB 600.9 kB +1.1 kB (+0.2%)
/(default)/product/[slug]/page 612.8 kB 614 kB +1.2 kB (+0.2%)
/(default)/webpages/[id]/contact/page 602.9 kB 604 kB +1.1 kB (+0.2%)
/(default)/webpages/[id]/normal/page 600.3 kB 601.4 kB +1.1 kB (+0.2%)
/(default)/wishlist/[token]/page 603.7 kB 604.9 kB +1.2 kB (+0.2%)
/maintenance/page 596.3 kB 597.4 kB +1.1 kB (+0.2%)
/_not-found/page 126.2 kB 551.3 kB +425.1 kB (+336.8%) ⚠️

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

@jorgemoya jorgemoya merged commit 04224f4 into integrations/makeswift Mar 25, 2026
15 of 18 checks passed
@jorgemoya jorgemoya deleted the sync-integrations-makeswift branch March 25, 2026 18:27
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@chanceaclark chanceaclark chanceaclark approved these changes

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@jorgemoya @chanceaclark @bc-svc-local