Skip to content

sync b2b-makeswift with makeswift@1.6.3#2970

Draft
matthewvolk wants to merge 321 commits intointegrations/b2b-makeswiftfrom
sync-b2b-makeswift-1.6.3
Draft

sync b2b-makeswift with makeswift@1.6.3#2970
matthewvolk wants to merge 321 commits intointegrations/b2b-makeswiftfrom
sync-b2b-makeswift-1.6.3

Conversation

@matthewvolk
Copy link
Copy Markdown
Contributor

Summary

Merges @bigcommerce/catalyst-makeswift@1.6.3 (all 1.6.x) into integrations/b2b-makeswift. Version set to 1.6.3.

Key changes from makeswift:

  • Root layout split: core/app/layout.tsx now holds MakeswiftProvider/html/body/SiteTheme
  • Locale layout simplified to just Catalyst providers
  • Minor bug fixes and improvements

B2B-only delta

@bigcommerce/catalyst-makeswift@1.6.3...sync-b2b-makeswift-1.6.3

Conflicts resolved

File Resolution
README.md Kept B2B readme
core/app/.../register/* (2 files) Kept B2B deletion
core/app/[locale]/layout.tsx Took makeswift's simplified layout (fragment), preserved <B2BLoader />
pnpm-lock.yaml Regenerated

Do not squash or rebase-and-merge this PR. Use a true merge commit.

PR 5 of 5: 1.2.0 ✅ → 1.3.8 ✅ → 1.4.2 ✅ → 1.5.0 ✅ → 1.6.3

After this PR merges, the branch will also need a trivial merge of the remaining ~4 canary commits.

agurtovoy and others added 30 commits September 24, 2025 10:49
…2619)

* Add stock level message to product page based on inventory settings

* Add UI tests to cover stock level message on product page

* Add a changeset to the new version
* feat(other): LOCAL-1444 delivery translation

* chore(core): create translations patch

---------

Co-authored-by: bc-svc-local <bc-svc-local@users.noreply.github.com>
* feat(core): Add /gift-certificates page on enabled currencies, add gift certificate ui components

* feat(core): Add Gift Certificates check balance page

* feat(core): Add Purchase page for Gift Certificates, update select component and dynamic form

* feat(core): Add ability to apply and see gift certificates on cart page

* feat(core): Add gift certificates to orders list and order details
Upgrades to the latest @makeswift/runtime version, which includes a new
ReactRuntimeCore that does not include dependencies for builtin components.
We now manually register the builtins we want, omitting registrations for
components that are intentionally omitted or overridden in Catalyst.
…-core-runtime

fix: use react runtime core to reduce bundle
Bumps [next-auth](https://github.com/nextauthjs/next-auth) from 5.0.0-beta.25 to 5.0.0-beta.30.
- [Release notes](https://github.com/nextauthjs/next-auth/releases)
- [Commits](https://github.com/nextauthjs/next-auth/commits/next-auth@5.0.0-beta.30)

---
updated-dependencies:
- dependency-name: next-auth
  dependency-version: 5.0.0-beta.30
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
* feat(other): LOCAL-1444 delivery translation

* chore(core): create translations patch

---------

Co-authored-by: bc-svc-local <bc-svc-local@users.noreply.github.com>
* feat(other): LOCAL-1444 delivery translation

* chore(core): create translations patch

---------

Co-authored-by: bc-svc-local <bc-svc-local@users.noreply.github.com>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
chanceaclark and others added 26 commits March 19, 2026 18:08
…elect (#2934)

The dropdown menu used `ring` (3px default) while the Select component
used `ring-1` (1px). This caused a visually thick border on dropdown
menus, most noticeably on the wishlist page.

Fixes CATALYST-1570

Co-authored-by: Claude <noreply@anthropic.com>
Updated the required Node.js versions to only allow version 24.
#2940)

* Initial plan

* fix: align Node.js v24 engine requirements across create-catalyst and core

- Update packages/create-catalyst/package.json engines from
  ^20.0.0 || ^22.0.0 || ^24.0.0 to ^24.0.0 to match the runtime check
  in bin/index.cjs and core/package.json (>=24.0.0)
- Fix core/README.md which referenced Node.js version 20 or 22 instead
  of 24
- Extract supported Node.js versions into bin/supported-node-versions.cjs
  as the single source of truth
- Add src/utils/node-version.spec.ts to test the version gating logic

Closes #2939

Co-authored-by: chanceaclark <10539418+chanceaclark@users.noreply.github.com>

* fix: resolve lint errors in node-version.spec.ts

- Use named import { satisfies } from 'semver' instead of default import
  (fixes import/no-named-as-default-member warning)
- Remove require() of .cjs file to avoid import/extensions and
  @typescript-eslint/consistent-type-assertions errors
- Simplify bin/index.cjs to remove unused intermediate variable

Co-authored-by: chanceaclark <10539418+chanceaclark@users.noreply.github.com>

* chore: add changeset for Node.js v24 engine alignment in create-catalyst

Co-authored-by: chanceaclark <10539418+chanceaclark@users.noreply.github.com>

---------

Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com>
Co-authored-by: chanceaclark <10539418+chanceaclark@users.noreply.github.com>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
npm's sigstore provenance verification requires package.json to have a
repository.url matching the GitHub repository. Without this field,
changeset publish fails with E422 for all published packages.

Co-authored-by: Claude <noreply@anthropic.com>
chore: sync integrations/makeswift with canary
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
* feat(other): LOCAL-1444 delivery translation

* chore(core): create translations patch

---------

Co-authored-by: bc-svc-local <bc-svc-local@users.noreply.github.com>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
…akeswift

# Conflicts:
#	core/CHANGELOG.md
#	core/app/[locale]/layout.tsx
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Merges @bigcommerce/catalyst-makeswift@1.2.0 into integrations/b2b-makeswift.
Package renamed to @bigcommerce/catalyst-b2b-makeswift, version set to 1.2.0.
Merges @bigcommerce/catalyst-makeswift@1.3.8 into integrations/b2b-makeswift.
Version set to 1.3.8. Key changes: ConsentManager, gift certificates,
inventory display, next-auth beta.30. B2B additions preserved.
Merges @bigcommerce/catalyst-makeswift@1.4.2 into integrations/b2b-makeswift.
Version set to 1.4.2. Key changes: OpenTelemetry, review forms,
firstName/lastName in auth, inventory display improvements.
B2B additions preserved.
Merges @bigcommerce/catalyst-makeswift@1.5.0 into integrations/b2b-makeswift.
Version set to 1.5.0. Breaking changes:
- middlewares/ → proxies/ (with-b2b.ts ported to ProxyFactory)
- middleware.ts → proxy.ts (withB2B added to proxy chain)
- Next.js 16 upgrade
- Node.js 24 required
- embla-carousel 9.0.0-rc01
B2B additions preserved.
Merges @bigcommerce/catalyst-makeswift@1.6.3 into integrations/b2b-makeswift.
Version set to 1.6.3. Key changes: root layout split (app/layout.tsx),
MakeswiftProvider/html/body moved to root layout. B2B additions preserved.
@changeset-bot
Copy link
Copy Markdown

changeset-bot bot commented Apr 3, 2026

⚠️ No Changeset found

Latest commit: 8638d8e

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 Apr 3, 2026

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

Project Deployment Actions Updated (UTC)
catalyst Ready Ready Preview, Comment Apr 3, 2026 2:52pm

Request Review

@github-actions
Copy link
Copy Markdown
Contributor

github-actions bot commented Apr 3, 2026

Bundle Size Report

Comparing against baseline from a8dd99e (2026-04-03).

Metric Baseline Current Delta
First Load JS 117.7 kB 118.6 kB +0.9 kB (+0.8%)
Total JS 429.8 kB 590.8 kB +161 kB (+37.5%) ⚠️

Per-Route First Load JS

Route Baseline Current Delta
/(default)/(auth)/change-password/page 301.2 kB 601.1 kB +299.9 kB (+99.6%) ⚠️
/(default)/(auth)/login/forgot-password/page 300.4 kB 600.2 kB +299.8 kB (+99.8%) ⚠️
/(default)/(auth)/login/page 300.8 kB 600.8 kB +300 kB (+99.7%) ⚠️
/(default)/(auth)/register/page 336.9 kB -- REMOVED
/(default)/(faceted)/brand/[slug]/page 312.9 kB 607.1 kB +294.2 kB (+94%) ⚠️
/(default)/(faceted)/category/[slug]/page 321.2 kB 615.3 kB +294.1 kB (+91.6%) ⚠️
/(default)/(faceted)/search/page 312.9 kB 607.1 kB +294.2 kB (+94%) ⚠️
/(default)/[...rest]/page 295.9 kB 602.2 kB +306.3 kB (+103.5%) ⚠️
/(default)/account/addresses/page 340.4 kB 604.7 kB +264.3 kB (+77.6%) ⚠️
/(default)/account/orders/[id]/page 304 kB 599.9 kB +295.9 kB (+97.3%) ⚠️
/(default)/account/orders/page 305 kB 600.8 kB +295.8 kB (+97%) ⚠️
/(default)/account/settings/page 311.6 kB 604.2 kB +292.6 kB (+93.9%) ⚠️
/(default)/account/wishlists/[id]/page 319 kB 609.5 kB +290.5 kB (+91.1%) ⚠️
/(default)/account/wishlists/page 314 kB 604.2 kB +290.2 kB (+92.4%) ⚠️
/(default)/blog/[blogId]/page 295.9 kB 602.2 kB +306.3 kB (+103.5%) ⚠️
/(default)/blog/page 296.9 kB 603 kB +306.1 kB (+103.1%) ⚠️
/(default)/cart/page 316.8 kB 609 kB +292.2 kB (+92.2%) ⚠️
/(default)/compare/page 308.1 kB 603.5 kB +295.4 kB (+95.9%) ⚠️
/(default)/gift-certificates/balance/page 299.8 kB 604 kB +304.2 kB (+101.5%) ⚠️
/(default)/gift-certificates/page 295.9 kB 602.2 kB +306.3 kB (+103.5%) ⚠️
/(default)/gift-certificates/purchase/page 339.4 kB 603.9 kB +264.5 kB (+77.9%) ⚠️
/(default)/page 313.1 kB 602.2 kB +289.1 kB (+92.3%) ⚠️
/(default)/product/[slug]/page 367.9 kB 615.3 kB +247.4 kB (+67.2%) ⚠️
/(default)/webpages/[id]/contact/page 337.9 kB 605.4 kB +267.5 kB (+79.2%) ⚠️
/(default)/webpages/[id]/normal/page 304 kB 602.8 kB +298.8 kB (+98.3%) ⚠️
/(default)/wishlist/[token]/page 308.9 kB 606.2 kB +297.3 kB (+96.2%) ⚠️
/maintenance/page 289.9 kB 598.8 kB +308.9 kB (+106.6%) ⚠️
/_global-error/page 125.2 kB 126.2 kB +1 kB (+0.8%)
/_not-found/page 125.2 kB 550.1 kB +424.9 kB (+339.4%) ⚠️

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

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.