sync b2b-makeswift with makeswift@1.3.8 by matthewvolk · Pull Request #2967 · bigcommerce/catalyst

matthewvolk · 2026-04-03T14:45:41Z

Summary

Caution

This branch experiences the same issue described by #2905

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

* 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

…2510)

* 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

fix: include apiOrigin and appOrigin props to Makeswift provider

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

…akeswift

chore: add changeset for 1.3.6 release

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

chore: fix next.js and react CVEs

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

chore: fix CVEs

…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 · 2026-04-03T14:45:46Z

⚠️ 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 · 2026-04-03T14:45:47Z

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

Project	Deployment	Actions	Updated (UTC)
catalyst	Error		Apr 3, 2026 2:48pm

chanceaclark · 2026-07-24T21:42:24Z

Closing. We're retiring this anchor-based sync ladder and reviving the b2b-makeswift upgrade from scratch under LTRAC-1297: climbing makeswift minor tags on top of the live integrations/b2b-makeswift. Branch deleted; commits stay referenced by this PR if we ever need them. Thanks Matt.

jorgemoya and others added 30 commits July 23, 2025 20:20

refactor(cli): use consola for version logs and update tests (#2505)

2b9b1b2

feat(cli): add dev command (#2498)

071b7f5

* 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 (#2501)

59f0d15

* 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

refactor: modify cf observability config to decrease logs generated (#…

c9eeca2

…2510)

refactor: remove chalk in favor of consola.colorize (#2511)

7c80b0b

feat: build catalyst with opennextjs-cloudflare (#2493)

b775f69

feat(cli): streaming updates for deployment (#2497)

3d7f8f7

* 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: introduce telemetry to catalyst cli (#2514)

a1cdcbf

refactor: unwrap get and set instance methods of conf (#2516)

0b58e58

Preconnect to checkout origin on cart page (#2521)

6f6a8af

refactor: proxy all valid next start and dev options (#2523)

0e1ea25

refactor: default framework to nextjs on conf init (#2524)

699e161

fix(core): set secure value whenever we prefix cookie (#2526)

2089a58

refactor: add command name to bin field (#2529)

48ced72

feat(cli): update route to /v3/infrastructure/ (#2519)

b1b3dea

refactor: add options for framework and project uuid to build command (…

3268c45

…#2530)

refactor: remove nypm since dependencies should already be installed (#…

18e8e09

…2531)

refactor: run build directly on core (#2527)

16a1197

refactor: organize configuration files for better build output (#2532)

25bc118

refactor: dynamically build wrangler.jsonc and inject project uuid (#…

f994d6c

…2534)

refactor: proxy next build if framework is nextjs (#2535)

50666af

feat: ignore files and folders output by catalyst build (#2536)

ad2d8ea

feat: override buildcommand when building with opennextjs-cloudflare (#…

4bb2979

…2537)

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

114e64c

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

feat(cli): add --dry-run option to deploy (#2540)

d89183c

* feat(cli): add --dry-run option to deploy * fix: split path

feat(cli): allow creation of project in link command (#2539)

7c449c2

feat: replace Vercel KV adapter with Vercel Runtime Cache API (#2475)

33b574d

chore: update @makeswift/runtime to version 0.25.0 in package.json

63d2dd7

github-actions Bot and others added 24 commits November 18, 2025 11:37

Version Packages (integrations/makeswift)

61f7351

fix: include apiOrigin and appOrigin props to Makeswift provider

05f40a2

Merge pull request #2736 from bigcommerce/fix/staging

ff68bc2

fix: include apiOrigin and appOrigin props to Makeswift provider

Version Packages (integrations/makeswift)

a43846b

Merge pull request #2737 from bigcommerce/changeset-release/integrati…

fdd90c3

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

chore: update next to latest v15

720fe17

Version Packages (canary)

44bb14f

Merge tag '@bigcommerce/catalyst-core@1.3.5' into sync-integrations-m…

22d3151

…akeswift

chore: add changeset for 1.3.6 release

a0408ee

Merge pull request #2746 from bigcommerce/chore/add-changeset

d75f8c0

chore: add changeset for 1.3.6 release

Version Packages (integrations/makeswift)

3f136ad

Merge pull request #2747 from bigcommerce/changeset-release/integrati…

edd741a

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

chore: fix next.js and react CVEs

83c5b75

Merge pull request #2764 from bigcommerce/chore/update-next

c688134

chore: fix next.js and react CVEs

Version Packages (integrations/makeswift)

1748175

Merge pull request #2765 from bigcommerce/changeset-release/integrati…

3dc74a1

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

chore: fix CVEs

b475a36

Merge pull request #2773 from bigcommerce/patch/catalyst-makeswift-1.3.8

c698ce1

chore: fix CVEs

Version Packages (integrations/makeswift)

b9075eb

Merge pull request #2774 from bigcommerce/changeset-release/integrati…

7fd9b69

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

merge: sync b2b-makeswift with makeswift@1.2.0

f2817e6

Merges @bigcommerce/catalyst-makeswift@1.2.0 into integrations/b2b-makeswift. Package renamed to @bigcommerce/catalyst-b2b-makeswift, version set to 1.2.0.

chore: regenerate pnpm-lock.yaml for 1.2.0

b912616

merge: sync b2b-makeswift with makeswift@1.3.8

a34e319

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.

chore: regenerate pnpm-lock.yaml for 1.3.8

47861c0

vercel Bot had a problem deploying to Preview April 3, 2026 14:48 Failure

chanceaclark closed this Jul 24, 2026

chanceaclark deleted the sync-b2b-makeswift-1.3.8 branch July 24, 2026 21:42

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

sync b2b-makeswift with makeswift@1.3.8#2967

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

matthewvolk commented Apr 3, 2026 •

edited

Loading

Uh oh!

changeset-bot Bot commented Apr 3, 2026

Uh oh!

vercel Bot commented Apr 3, 2026 •

edited

Loading

Uh oh!

chanceaclark commented Jul 24, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

14 participants

Uh oh!

Conversation

matthewvolk commented Apr 3, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Summary

B2B-only delta

Conflicts resolved

Uh oh!

changeset-bot Bot commented Apr 3, 2026

⚠️ No Changeset found

Uh oh!

vercel Bot commented Apr 3, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

chanceaclark commented Jul 24, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

14 participants

matthewvolk commented Apr 3, 2026 •

edited

Loading

vercel Bot commented Apr 3, 2026 •

edited

Loading