sync b2b-makeswift with makeswift@1.2.0 by matthewvolk · Pull Request #2966 · bigcommerce/catalyst

matthewvolk · 2026-04-03T14:42:43Z

Summary

Merges @bigcommerce/catalyst-makeswift@1.2.0 into integrations/b2b-makeswift as the first step in incrementally bringing the B2B branch up to date with the latest makeswift releases.

Package renamed to @bigcommerce/catalyst-b2b-makeswift
Version set to 1.2.0
B2B-specific code preserved (quote button, B2BLoader, registration redirect, auth token flow)
Kept Next.js 15.5.9 (the b2b branch was already on this version)

B2B-only delta

Compare against the merge target to see just the B2B layer:
@bigcommerce/catalyst-makeswift@1.2.0...sync-b2b-makeswift-1.2.0

Conflicts resolved

File	Resolution
`core/CHANGELOG.md`	Took makeswift's version
`core/package.json`	Renamed to b2b-makeswift, version 1.2.0, kept Next.js 15.5.9
`core/vibes/soul/sections/cart/client.tsx`	Kept B2B quote button + adopted makeswift's `isLineItemActionPending`
`pnpm-lock.yaml`	Regenerated

Do not squash or rebase-and-merge this PR. Use a true merge commit to preserve the merge base between integrations/makeswift and integrations/b2b-makeswift.

This is PR 1 of 5 in the incremental sync series:

→ 1.2.0 (this PR)
→ 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

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

…le (#2542)

* feat(cli): add env option to deploy command * fix: remove default values * fix: change error message * fix: rename to secrets * fix: use variadic option

…-variable-names-for-text-color-in-catalyst fix: text variable for button and button-link components

…w-tab-property-not-working-in-site-footer feat: support target prop in Footer links

* feat(core): add visual queues when cart update is pending * fix: add pulse animation to skeletons

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

…o 1.2.0 (#2582)

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.

changeset-bot · 2026-04-03T14:42:50Z

⚠️ No Changeset found

Latest commit: b912616

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:42:52Z

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

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

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

bookernath and others added 18 commits August 24, 2025 23:27

Merge pull request #2546 from bigcommerce/runtime-0.25.0

f619642

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

fix(cli): prevent existing bundle.zip from being included in the bund…

eab04b8

…le (#2542)

fix: build command --project-uuid should also read from env (#2557)

85de083

feat(cli): add env option to deploy command (#2558)

3cc89f9

* feat(cli): add env option to deploy command * fix: remove default values * fix: change error message * fix: rename to secrets * fix: use variadic option

fix: text variable for button and button-link components

03b35f7

Merge pull request #2559 from bigcommerce/hunter/eng-10334-update-css…

b0da775

…-variable-names-for-text-color-in-catalyst fix: text variable for button and button-link components

fix(cli): update description for secret option in deploy (#2562)

9166b76

chore: prefer performance.now over Date.now in server component (#2563)

707ec24

chore: fix performance.now to 2 decimal places (#2565)

a27054f

feat: support target prop in Footer links

4145846

Merge pull request #2568 from bigcommerce/hunter/eng-10346-open-in-ne…

f15e9db

…w-tab-property-not-working-in-site-footer feat: support target prop in Footer links

feat(core): add visual queues when cart update is pending (#2564)

69797a4

* feat(core): add visual queues when cart update is pending * fix: add pulse animation to skeletons

Version Packages (canary) (#2522)

4d30763

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

Merge branch 'canary' into sync-integrations-makeswift

fc658c0

chore(makeswift): changeset to bump @bigcommerce/catalyst-makeswift t…

b3c7bbf

…o 1.2.0 (#2582)

Version Packages (integrations/makeswift) (#2553)

bedf1d6

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

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

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

sync b2b-makeswift with makeswift@1.2.0#2966

sync b2b-makeswift with makeswift@1.2.0#2966
matthewvolk wants to merge 48 commits intointegrations/b2b-makeswiftfrom
sync-b2b-makeswift-1.2.0

matthewvolk commented Apr 3, 2026

Uh oh!

changeset-bot bot commented Apr 3, 2026

Uh oh!

vercel bot commented Apr 3, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

Conversation

matthewvolk commented Apr 3, 2026

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

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants