Merge branch 'canary' into sync-integrations-makeswift

Author: matthewvolk

core/app/[locale]/(default)/(auth)/login/forgot-password/_actions/reset-password.ts

@@ -10,9 +10,9 @@ import { client } from '~/client';
 import { graphql } from '~/client/graphql';
 
 const ResetPasswordMutation = graphql(`
-  mutation ResetPasswordMutation($input: RequestResetPasswordInput!, $reCaptcha: ReCaptchaV2Input) {
+  mutation ResetPasswordMutation($input: RequestResetPasswordInput!) {
     customer {
-      requestResetPassword(input: $input, reCaptchaV2: $reCaptcha) {
+      requestResetPassword(input: $input) {
         __typename
         errors {
           __typename
@@ -28,8 +28,6 @@ const ResetPasswordMutation = graphql(`
 export const resetPassword = async (
   _lastResult: { lastResult: SubmissionResult | null; successMessage?: string },
   formData: FormData,
-  // TODO: add recaptcha token
-  // reCaptchaToken,
 ): Promise<{ lastResult: SubmissionResult | null; successMessage?: string }> => {
   const t = await getTranslations('Auth.Login.ForgotPassword');
 
@@ -47,7 +45,6 @@ export const resetPassword = async (
           email: submission.value.email,
           path: '/change-password',
         },
-        // ...(reCaptchaToken && { reCaptchaV2: { token: reCaptchaToken } }),
       },
       fetchOptions: {
         cache: 'no-store',

core/app/[locale]/(default)/(auth)/login/forgot-password/page.tsx

@@ -1,29 +1,10 @@
 import { Metadata } from 'next';
 import { getTranslations, setRequestLocale } from 'next-intl/server';
 
-// import { client } from '~/client';
-// import { graphql } from '~/client/graphql';
-// import { revalidate } from '~/client/revalidate-target';
-// import { bypassReCaptcha } from '~/lib/bypass-recaptcha';
-
 import { ForgotPasswordSection } from '@/vibes/soul/sections/forgot-password-section';
 
 import { resetPassword } from './_actions/reset-password';
 
-// TODO: add recaptcha token
-// const ResetPageQuery = graphql(`
-//   query ResetPageQuery {
-//     site {
-//       settings {
-//         reCaptcha {
-//           isEnabledOnStorefront
-//           siteKey
-//         }
-//       }
-//     }
-//   }
-// `);
-
 interface Props {
   params: Promise<{ locale: string }>;
 }
@@ -45,13 +26,6 @@ export default async function Reset(props: Props) {
 
   const t = await getTranslations('Auth.Login.ForgotPassword');
 
-  // TODO: add recaptcha token
-  // const { data } = await client.fetch({
-  //   document: ResetPageQuery,
-  //   fetchOptions: { next: { revalidate } },
-  // });
-  // const recaptchaSettings = await bypassReCaptcha(data.site.settings?.reCaptcha);
-
   return (
     <ForgotPasswordSection action={resetPassword} subtitle={t('subtitle')} title={t('title')} />
   );

core/app/[locale]/(default)/(auth)/register/_actions/register-customer.ts

@@ -17,12 +17,9 @@ import { getCartId } from '~/lib/cart';
 import { ADDRESS_FIELDS_NAME_PREFIX, CUSTOMER_FIELDS_NAME_PREFIX } from './prefixes';
 
 const RegisterCustomerMutation = graphql(`
-  mutation RegisterCustomerMutation(
-    $input: RegisterCustomerInput!
-    $reCaptchaV2: ReCaptchaV2Input
-  ) {
+  mutation RegisterCustomerMutation($input: RegisterCustomerInput!) {
     customer {
-      registerCustomer(input: $input, reCaptchaV2: $reCaptchaV2) {
+      registerCustomer(input: $input) {
         customer {
           firstName
           lastName
@@ -360,7 +357,6 @@ export async function registerCustomer<F extends Field>(
       document: RegisterCustomerMutation,
       variables: {
         input,
-        // ...(recaptchaToken && { reCaptchaV2: { token: recaptchaToken } }),
       },
       fetchOptions: { cache: 'no-store' },
     });

core/app/[locale]/(default)/(auth)/register/page-data.ts

@@ -4,7 +4,6 @@ import { getSessionCustomerAccessToken } from '~/auth';
 import { client } from '~/client';
 import { graphql, VariablesOf } from '~/client/graphql';
 import { FormFieldsFragment } from '~/data-transformers/form-field-transformer/fragment';
-import { bypassReCaptcha } from '~/lib/bypass-recaptcha';
 
 const RegisterCustomerQuery = graphql(
   `
@@ -25,12 +24,6 @@ const RegisterCustomerQuery = graphql(
             }
           }
         }
-        settings {
-          reCaptcha {
-            isEnabledOnStorefront
-            siteKey
-          }
-        }
       }
       geography {
         countries {
@@ -76,16 +69,13 @@ export const getRegisterCustomerQuery = cache(async ({ address, customer }: Prop
   const customerFields = response.data.site.settings?.formFields.customer;
   const countries = response.data.geography.countries;
 
-  const reCaptchaSettings = await bypassReCaptcha(response.data.site.settings?.reCaptcha);
-
   if (!addressFields || !customerFields) {
     return null;
   }
 
   return {
     addressFields,
     customerFields,
-    reCaptchaSettings,
     countries,
   };
 });

core/app/[locale]/(default)/(auth)/register/page.tsx

@@ -2,9 +2,6 @@ import { Metadata } from 'next';
 import { notFound } from 'next/navigation';
 import { getTranslations, setRequestLocale } from 'next-intl/server';
 
-// TODO: Add recaptcha token
-// import { bypassReCaptcha } from '~/lib/bypass-recaptcha';
-
 import { DynamicFormSection } from '@/vibes/soul/sections/dynamic-form-section';
 import {
   formFieldTransformer,
@@ -52,7 +49,6 @@ export default async function Register({ params }: Props) {
   }
 
   const { addressFields, customerFields, countries } = registerCustomerData;
-  // const reCaptcha = await bypassReCaptcha(reCaptchaSettings);
 
   const fields = transformFieldsToLayout(
     [

core/app/[locale]/(default)/account/addresses/_actions/update-address.ts

@@ -14,7 +14,7 @@ import { FieldNameToFieldId } from '~/data-transformers/form-field-transformer/u
 
 import { type State } from './address-action';
 
-export const UpdateCustomerAddressMutation = graphql(`
+const UpdateCustomerAddressMutation = graphql(`
   mutation UpdateCustomerAddressMutation($input: UpdateCustomerAddressInput!) {
     customer {
       updateCustomerAddress(input: $input) {

core/app/[locale]/(default)/account/wishlists/[id]/_components/wishlist-analytics-provider.tsx

@@ -31,7 +31,7 @@ export function WishlistAnalyticsProvider(
   );
 }
 
-export function WishlistAnalyticsProviderResolved({
+function WishlistAnalyticsProviderResolved({
   children,
   data,
 }: PropsWithChildren<{ data: Streamable<AddToCartContext[]> }>) {

core/app/[locale]/(default)/blog/page-data.ts

@@ -62,7 +62,7 @@ const BlogPostsPageQuery = graphql(
   [PaginationFragment],
 );
 
-export interface BlogPostsFiltersInput {
+interface BlogPostsFiltersInput {
   tag: string | null;
 }
 

core/app/[locale]/(default)/cart/_actions/update-quantity.ts

@@ -29,7 +29,7 @@ export type CartSelectedOptionsInput = ReturnType<
 type Variables = VariablesOf<typeof UpdateCartLineItemMutation>;
 type UpdateCartLineItemInput = Variables['input'];
 
-export interface UpdateProductQuantityParams extends CartLineItemInput {
+interface UpdateProductQuantityParams extends CartLineItemInput {
   lineItemEntityId: UpdateCartLineItemInput['lineItemEntityId'];
 }
 

core/app/[locale]/(default)/cart/_components/cart-analytics-provider.tsx

@@ -32,7 +32,7 @@ export function CartAnalyticsProvider(
   );
 }
 
-export function CartAnalyticsProviderResolved({
+function CartAnalyticsProviderResolved({
   children,
   data,
 }: PropsWithChildren<{ data: Streamable<AddToCartContext[]> }>) {