sync integrations/makeswift with canary#2926
Merged
jorgemoya merged 3 commits intointegrations/makeswiftfrom Mar 16, 2026
Merged
sync integrations/makeswift with canary#2926jorgemoya merged 3 commits intointegrations/makeswiftfrom
integrations/makeswift with canary#2926jorgemoya merged 3 commits intointegrations/makeswiftfrom
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>
# Conflicts: # core/app/[locale]/(default)/product/[slug]/page.tsx # core/app/[locale]/(default)/webpages/[id]/contact/page.tsx # pnpm-lock.yaml
|
The latest updates on your projects. Learn more about Vercel for GitHub.
|
|
Contributor
Bundle Size ReportComparing against baseline from
Per-Route First Load JS
|
Contributor
Unlighthouse Performance Comparison — VercelComparing PR preview deployment Unlighthouse scores vs production Unlighthouse scores. Summary ScoreAggregate score across all categories as reported by Unlighthouse.
Category Scores
Core Web Vitals
|
Contributor
|
Hey! So just for my understanding, the actual code in this PR has been approved previously when merging into canary, and this is just bringing the Also, is there any documentation on the |
chanceaclark
approved these changes
Mar 16, 2026
Contributor
|
@parthshahp this claude skill + |
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
5 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.
Summary
Merges
canaryintointegrations/makeswiftto bring the Makeswift integration up to date.What came from canary
~/lib/recaptchahelpers andgetRecaptchaSiteKey().canary) bumpConflict resolutions
core/app/[locale]/(default)/product/[slug]/page.tsx— kept both makeswift imports (getMakeswiftPageMetadata,ProductDetailfrom~/lib/makeswift/components/product-detail) and canary's newgetRecaptchaSiteKeyimport.core/app/[locale]/(default)/webpages/[id]/contact/page.tsx— kept bothgetMakeswiftPageMetadataand the newgetRecaptchaSiteKeyimport.pnpm-lock.yaml— accepted canary's version then regenerated withpnpm install --no-frozen-lockfile.Changeset cleanup
Removed
.changeset/lazy-rivers-stare.md(targets@bigcommerce/catalyst-core, not@bigcommerce/catalyst-makeswift).