Skip to content

Sync integrations makeswift#2660

Merged
chanceaclark merged 14 commits into
integrations/makeswiftfrom
sync-integrations-makeswift
Oct 31, 2025
Merged

Sync integrations makeswift#2660
chanceaclark merged 14 commits into
integrations/makeswiftfrom
sync-integrations-makeswift

Conversation

@chanceaclark

@chanceaclark chanceaclark commented Oct 31, 2025

Copy link
Copy Markdown
Contributor

What/Why?

Syncs the canary branch with the integrations/makeswift branch.

Note

Keep in mind that there is a change to the CLI in this merge, it shouldn't affect anything regarding the alpha branch because it was before we released it.

Testing

See each PR

Migration

Pull in the latest tagged code when released.

jkanive and others added 14 commits September 11, 2025 19:43
@jkanive
chore(common): Fixes maintenance page with issue (#2551)
be23108
@bc-svc-local
Update translations (#2608)
3d47825 
* feat(other): LOCAL-1444 delivery translation

* chore(core): create translations patch

---------

Co-authored-by: bc-svc-local <bc-svc-local@users.noreply.github.com>
@chanceaclark
fix(plp): add back product counts and collapse by default (#2609)
4e6f58d
@chanceaclark
feat(cli): general UX improvements (#2605)
3c16893 
* feat(cli): add dotenv to provide better UX

* feat(cli): provide log level support on CLI
@chanceaclark
chore: reorganize cli package for future extension (#2611)
b8ee9bf 
* chore: git mv packages/cli -> packages/catalyst

* chore: move test files

* chore: move files into new entrypoint folder

* chore: change linting rules around to account for moved files
@matthewvolk
docs: explain multiple branch release process (#2555)
b708575
@Tharaae
Add stock level message to product page based on inventory settings (#…
19077cd 
…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
@chanceaclark
refactor: stream the analytics provider (#2637)
4845d87
@bc-svc-local
Update translations (#2648)
7914650 
* feat(other): LOCAL-1444 delivery translation

* chore(core): create translations patch

---------

Co-authored-by: bc-svc-local <bc-svc-local@users.noreply.github.com>
@matthewvolk
feat(scripts): add consent manager provider using c15t (#2643)
391e20d
@jordanarldt
feat(core): Add gift certificates functionality (#2652)
660a9a8 
* 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
@matthewvolk
feat(scripts): add consent manager ui and internationalization (#2650)
416796f
@jordanarldt
feat(core): Add payment methods to order details (#2653)
30fef97
@chanceaclark
Merge branch 'canary' into sync-integrations-makeswift
ca8a2a2
@chanceaclark
chanceaclark requested a review from a team October 31, 2025 17:26
@changeset-bot

changeset-bot Bot commented Oct 31, 2025

Copy link
Copy Markdown

⚠️ No Changeset found

Latest commit: ca8a2a2

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

vercel Bot commented Oct 31, 2025

Copy link
Copy Markdown

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

Project Deployment Preview Comments Updated (UTC)
catalyst-b2b Ready Ready Preview Comment Oct 31, 2025 5:26pm
catalyst-canary Ready Ready Preview Comment Oct 31, 2025 5:26pm
1 Skipped Deployment
Project Deployment Preview Comments Updated (UTC)
catalyst Ignored Ignored Oct 31, 2025 5:26pm

matthewvolk
matthewvolk approved these changes Oct 31, 2025
View reviewed changes

@matthewvolk matthewvolk left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This looks good to me—spot checked for a couple files that usually get written to incorrectly during these sync's, pulled down the branch locally and did some manual testing with Makeswift 👍

@chanceaclark
chanceaclark merged commit ca8a2a2 into integrations/makeswift Oct 31, 2025
12 checks passed
@chanceaclark
chanceaclark deleted the sync-integrations-makeswift branch October 31, 2025 20:01
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@jorgemoya jorgemoya jorgemoya approved these changes
+1 more reviewer
@matthewvolk matthewvolk matthewvolk approved these changes
Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

7 participants

@chanceaclark @jorgemoya @matthewvolk @jkanive @bc-svc-local @Tharaae @jordanarldt