Skip to content

Sync recent changes from canary into integrations/makeswift#2601

Merged
matthewvolk merged 14 commits into
integrations/makeswiftfrom
sync-integrations-makeswift
Sep 10, 2025
Merged

Sync recent changes from canary into integrations/makeswift#2601
matthewvolk merged 14 commits into
integrations/makeswiftfrom
sync-integrations-makeswift

Conversation

@matthewvolk

@matthewvolk matthewvolk commented Sep 10, 2025

Copy link
Copy Markdown
Contributor

What/Why?

Regular sync to make cutting a release easier to reason about (smaller diff) next time we release.

Testing

Manually reviewed the diff, all changes look good. They are mostly comprised of removing reCaptcha logic and removing the unused exports from knip

Migration

N/A

Jira: CATALYST-1479

jorgemoya and others added 12 commits September 4, 2025 16:26
…nction (#2591)

* deps(create-catalyst): lock chalk to 5.4.1

* deps(create-catalyst): replace chalk with consola colorize utility function
* fix(core): Add graceful error handling for invalid anonymous JWT cookies

Co-Authored-By: bookernath <8922457+bookernath@users.noreply.github.com>

* move to middleware

* Clean up invalid JWT handling implementation

Co-authored-by: bookernath <8922457+bookernath@users.noreply.github.com>

* Add package-lock.json to .gitignore for pnpm workspace

Co-authored-by: bookernath <8922457+bookernath@users.noreply.github.com>

* Simplify invalid JWT handling and fix npm usage in .gitignore

Co-authored-by: bookernath <8922457+bookernath@users.noreply.github.com>

* Simplify error handling by removing console.error logging

Co-authored-by: bookernath <8922457+bookernath@users.noreply.github.com>

* fix(session): revert unnecessary changes, add logs

---------

Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com>
Co-authored-by: bookernath <8922457+bookernath@users.noreply.github.com>
Co-authored-by: Nathan Booker <nathan.booker@bigcommerce.com>
Co-authored-by: Matthew Volk <matt.volk@bigcommerce.com>
* 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
matthewvolk requested a review from a team September 10, 2025 16:04
@matthewvolk
matthewvolk requested a review from a team as a code owner September 10, 2025 16:04
@changeset-bot

changeset-bot Bot commented Sep 10, 2025

Copy link
Copy Markdown

⚠️ No Changeset found

Latest commit: 3b60b13

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 Sep 10, 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 Sep 10, 2025 4:29pm
catalyst-canary Ready Ready Preview Comment Sep 10, 2025 4:29pm
3 Skipped Deployments
Project Deployment Preview Comments Updated (UTC)
catalyst Ignored Ignored Sep 10, 2025 4:29pm
catalyst-au Ignored Ignored Sep 10, 2025 4:29pm
catalyst-uk Ignored Ignored Sep 10, 2025 4:29pm

chanceaclark
chanceaclark previously approved these changes Sep 10, 2025
@chanceaclark

Copy link
Copy Markdown
Contributor

Might need to revert those export changes actually. cc @jorgemoya

@jorgemoya

Copy link
Copy Markdown
Contributor

@chanceaclark Are the exports being used in this branch but not canary?

@chanceaclark

Copy link
Copy Markdown
Contributor

Seems like it @jorgemoya

@matthewvolk
matthewvolk dismissed chanceaclark’s stale review September 10, 2025 16:20

Going to need a re-review after reverting a change in canary necessary for this branch

@matthewvolk
matthewvolk merged commit 3b60b13 into integrations/makeswift Sep 10, 2025
14 checks passed
@matthewvolk
matthewvolk deleted the sync-integrations-makeswift branch September 10, 2025 16:49
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.

5 participants