Skip to content

sync b2b-makeswift with makeswift@1.4.2#2968

Draft
matthewvolk wants to merge 248 commits intointegrations/b2b-makeswiftfrom
sync-b2b-makeswift-1.4.2
Draft

sync b2b-makeswift with makeswift@1.4.2#2968
matthewvolk wants to merge 248 commits intointegrations/b2b-makeswiftfrom
sync-b2b-makeswift-1.4.2

Conversation

@matthewvolk
Copy link
Copy Markdown
Contributor

Summary

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

Key changes from makeswift:

  • OpenTelemetry instrumentation
  • Review forms on product pages
  • firstName/lastName in auth session (separate from combined name)
  • Inventory display improvements
  • Various bug fixes

B2B-only delta

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

Conflicts resolved

File Resolution
core/app/.../register/* (3 files) Kept B2B deletion
core/app/.../login/page.tsx Kept B2B redirect /?section=orders, added error handling
core/auth/index.ts Kept B2B b2bToken + added makeswift's firstName/lastName
core/data-transformers/product-options-transformer.ts Kept B2B id field, used explicit persist: true/false
core/vibes/.../product-detail-form.tsx Added clsx import, fixed duplicate t variable
core/package.json Version 1.4.2, kept react-google-recaptcha, took 15.5.10
pnpm-lock.yaml Regenerated

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

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

jorgemoya and others added 30 commits July 23, 2025 20:20
* feat(cli): create deployment

* chore: use conf to read from file

* refactor: update how to call conf

* refactor: create class for store config

* feat: add get/set to config

* fix: remove describe import

* fix: error message

* chore: rename projectId to projectUuid
* feat(cli): adds dev command

* refactor: run local binary

* fix: pass port to execa command

* chore: add test

* feat: remove codegen

* refactor: handle error message correctly

* fix: add dev to program test
* feat(cli): add start command

* fix: pass port to execa command

* chore: add test

* refactor: handle error message correctly

* fix: add start to program test
* feat(cli): add link command

* feat: add project framework when users succesfully links

* chore: update root-dir

* fix: update tests

* fix: throw error correctly

* feat: add test for no projects

* fix: show message when user is not opt in to alpha

* fix: use consola.mockTypes

* fix: add link to program test
* feat(cli): poll for deployment

* fix: update tests

* feat: update streaming logic

* fix: improve spinner and tests

* fix: add extra expects

* feat: use zod enum for steps
)

* feat(cli): run opennext-cloudflare preview for catalyst framework

* fix: update options
* feat(cli): add --dry-run option to deploy

* fix: split path
jorgemoya and others added 27 commits January 22, 2026 02:19
* fix(core): remove decorative price element from accessibility tree

* fix: update to include accessibility best practices

* fix: update changeset

* fix: add price label component
* Updated gift certificate balance placeholder

* remove placeholders from gift certificates form

* add placeholders for coupon code and gift certificate on cart page

* added changelog

* remove placeholder for coupon code
* chore(catalyst): CATALYST-1297 Run E2E tests on PRs

* fix(catalyst): Fix required prop missing on cart shipping form

* chore(catalyst): CATALYST-1297 Use test matrix
* chore(ci): pass channel-specific env vars to vercel deploy

* chore(ci): harden deploy workflow security

replace eval with bash arrays, add timeouts, improve secret handling

* chore(ci): add b2b env vars to deploy workflow
* 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>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
…ons/makeswift

Version Packages (`integrations/makeswift`)
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.
@changeset-bot
Copy link
Copy Markdown

changeset-bot bot commented Apr 3, 2026

⚠️ No Changeset found

Latest commit: 0fadcdc

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 Error Error Apr 3, 2026 2:51pm

Request Review

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.