sync: TRAC-1236 sync integrations/b2b-makeswift with integrations/makeswift@1.6.0 - #3145
Merged
chanceaclark merged 9 commits intoJul 29, 2026
Merged
Conversation
Simplify Stage 2 of the release process by including the @bigcommerce/catalyst-makeswift changeset directly in the sync merge commit instead of requiring a separate bump-version branch and PR. Also update the tags section with explicit commands for both packages.
* added recaptcha v3 * update recaptcha package and make visible on forms * linting * make recaptcha optional for dynamic-form * remove comments * remove comments * remove recaptcha provider since it wasn't used * make recaptcha required if enabled and use getValue to retrieve token * add types for react-google-recaptcha * fix linting * fix linting * fix linting * fix linting * refactor(recaptcha): validate in form actions and separate parse from validate - Add validateRecaptchaToken() to validate reCAPTCHA in form actions and return formErrors so Conform displays them (contact, review, register). - Add getRecaptchaFromForm() to parse site key and token from FormData. - Make validateRecaptchaToken() a pure function (siteKey, token, message) so validation is separate from form parsing and easier to test/reuse. - Contact, review, and register actions: parse via getRecaptchaFromForm(), then validate via validateRecaptchaToken(), and pass token to mutations. Made-with: Cursor * fix linting * remove client side logic and error handling * rename validat function for recaptha token to assertRecaptchaTokenPresent * remove unused recaptcha settings in graphql * fix linting * remove client side logic and validation for recaptcha * remove unused properties from RecaptchaSettings interface * remove unnecessary DynamicFormInner wrapper component Made-with: Cursor * remove unused failedLoginLockoutDurationSeconds and isEnabledOnCheckout from getReCaptchaSettings Made-with: Cursor * add changeset * chore: add tests for recaptcha --------- Co-authored-by: Jorge Moya <jorge.moya@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>
# Conflicts: # core/app/[locale]/(default)/product/[slug]/page.tsx # core/app/[locale]/(default)/webpages/[id]/contact/page.tsx # pnpm-lock.yaml
Add two Claude Code skills that automate the Catalyst release process and the integrations/makeswift branch sync workflow.
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
…ons-b2b-makeswift @bigcommerce/catalyst-makeswift@1.6.0 # Conflicts: # core/app/[locale]/(default)/(auth)/register/_actions/register-customer.ts # core/app/[locale]/(default)/(auth)/register/page.tsx
🦋 Changeset detectedLatest commit: 2f21399 The changes in this PR will be included in the next version bump. This PR includes changesets to release 1 package
Not sure what this means? Click here to learn what changesets are. Click here if you're a maintainer who wants to add another changeset to this PR |
|
The latest updates on your projects. Learn more about Vercel for GitHub.
|
Contributor
Bundle Size ReportComparing against baseline from
Per-Route First Load JS
|
parthshahp
approved these changes
Jul 29, 2026
chanceaclark
merged commit Jul 29, 2026
2f21399
into
integrations/b2b-makeswift
15 of 18 checks passed
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
6 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Jira: TRAC-1236
What/Why?
Rung 5 of 9 in the makeswift catch-up climb (LTRAC-1297):
1.5.0 → 1.6.0. Small rung, 8 commits.Register page: same pattern as rungs 2–4, makeswift's edit to the old
page.tsx/register-customer.tsis moot since b2b'sregister/route.tsredirect is untouched and still live. Kept the deletion.Interesting one:
react-google-recaptchacame back. I'd removed this dependency in rung 2 as dead weight (its only consumer was the old register form, which b2b had already deleted). This rung, upstream reintroduced reCAPTCHA support more broadly, product reviews (newreviews/review-form.tsx), the contact form, and the shareddynamic-formcomponent all now validate against a new~/lib/recaptchamodule. Confirmed these are real, newly-modified files with genuinereact-google-recaptcha/~/lib/recaptchausage, not leftover cruft, so kept the re-added dependency as-is.Same
package.json/CHANGELOG.mdsilent auto-merge, caught again (4th rung in a row): top-levelversionclobbered to raw1.6.0(reverted to b2b's actual1.5.0);CHANGELOG.mdhad makeswift's own historical entry pasted in (reverted to ours).Release-wiring guardrail: not conflicted this rung (nothing upstream touched those files), confirmed unchanged/correct regardless.
Per the deferred-issues plan, not investigating the
e2e.yml/bundle-size.ymlfindings from rung 4 here, those get addressed at the canary level after all 9 rungs land.Added
.changeset/sync-makeswift-1-6-0.mdfor this rung's own bump.Rollout/Rollback
Internal upgrade branch, no runtime/customer impact until eventually released and adopted. Rollback = revert the merge commit.
Do not squash or rebase-and-merge this PR. Use a true merge commit to preserve the merge base between
integrations/makeswiftandintegrations/b2b-makeswift.Testing
pnpm install --no-frozen-lockfileclean (Node 24).pnpm --filter @bigcommerce/catalyst-b2b-makeswift typecheck— clean (0 errors).pnpm --filter @bigcommerce/catalyst-b2b-makeswift lint— clean (0 errors, 0 warnings).CLI Tests (windows-latest)still red until rung 6 (1.7.0), the fix landed upstream after this tag.