Skip to content

sync b2b-makeswift with makeswift@1.3.8#2967

Draft
matthewvolk wants to merge 163 commits intointegrations/b2b-makeswiftfrom
sync-b2b-makeswift-1.3.8
Draft

sync b2b-makeswift with makeswift@1.3.8#2967
matthewvolk wants to merge 163 commits intointegrations/b2b-makeswiftfrom
sync-b2b-makeswift-1.3.8

Conversation

@matthewvolk
Copy link
Copy Markdown
Contributor

Summary

Merges @bigcommerce/catalyst-makeswift@1.3.8 (all 1.3.x patches) into integrations/b2b-makeswift. Version set to 1.3.8.

Key changes from makeswift:

  • ConsentManager for cookie consent
  • Gift certificate support
  • Inventory display messages
  • next-auth upgrade to beta.30
  • Various bug fixes across 8 patch releases

B2B-only delta

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

Conflicts resolved

File Resolution
.github/CODEOWNERS Took makeswift's
core/app/.../register/* (3 files) Kept B2B deletion (SDK handles registration)
core/app/[locale]/layout.tsx Added ConsentManager wrapping, preserved <B2BLoader />
core/messages/en.json Took makeswift's, added B2B i18n keys
core/package.json Version 1.3.8, kept react-google-recaptcha, took beta.30
pnpm-lock.yaml Regenerated

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

PR 2 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
github-actions bot and others added 27 commits November 17, 2025 21:14
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
fix: include apiOrigin and appOrigin props to Makeswift provider
…ons/makeswift

Version Packages (`integrations/makeswift`)
chore: add changeset for 1.3.6 release
…ons/makeswift

Version Packages (`integrations/makeswift`)
…ons/makeswift

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

changeset-bot bot commented Apr 3, 2026

⚠️ No Changeset found

Latest commit: 47861c0

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:48pm

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.