diff --git a/components/common/Layout/Layout.tsx b/components/common/Layout/Layout.tsx
index dece18b67..44c4e54e1 100644
--- a/components/common/Layout/Layout.tsx
+++ b/components/common/Layout/Layout.tsx
@@ -43,8 +43,8 @@ const FeatureBar = dynamic(
 )
 
 const Modal = dynamic(
-  () => import('@components/ui/Modal'), 
-  Object.assign(dynamicProps, {ssr: false})
+  () => import('@components/ui/Modal'),
+  Object.assign(dynamicProps, { ssr: false })
 )
 
 interface Props {
diff --git a/components/common/UserNav/UserNav.tsx b/components/common/UserNav/UserNav.tsx
index a48861df7..c6d5abdf3 100644
--- a/components/common/UserNav/UserNav.tsx
+++ b/components/common/UserNav/UserNav.tsx
@@ -28,9 +28,16 @@ const UserNav: FC<Props> = ({ className }) => {
       <ul className={s.list}>
         {process.env.COMMERCE_CART_ENABLED && (
           <li className={s.item}>
-            <Button className={s.item} variant="naked" onClick={toggleSidebar} aria-label={`Cart items: ${itemsCount}`}>
+            <Button
+              className={s.item}
+              variant="naked"
+              onClick={toggleSidebar}
+              aria-label={`Cart items: ${itemsCount}`}
+            >
               <Bag />
-              {itemsCount > 0 && <span className={s.bagCount}>{itemsCount}</span>}
+              {itemsCount > 0 && (
+                <span className={s.bagCount}>{itemsCount}</span>
+              )}
             </Button>
           </li>
         )}
diff --git a/components/product/Swatch/Swatch.tsx b/components/product/Swatch/Swatch.tsx
index d78142bab..1e0baadee 100644
--- a/components/product/Swatch/Swatch.tsx
+++ b/components/product/Swatch/Swatch.tsx
@@ -44,7 +44,7 @@ const Swatch: React.FC<Omit<ButtonProps, 'variant'> & SwatchProps> = React.memo(
       <Button
         role="option"
         aria-selected={active}
-        aria-label={(variant && label) ? `${variant} ${label}` : "Variant Swatch"}
+        aria-label={variant && label ? `${variant} ${label}` : 'Variant Swatch'}
         className={swatchClassName}
         {...(label && color && { title: label })}
         style={color ? { backgroundColor: color } : {}}
diff --git a/components/ui/Sidebar/Sidebar.tsx b/components/ui/Sidebar/Sidebar.tsx
index 40698aec9..b43959a40 100644
--- a/components/ui/Sidebar/Sidebar.tsx
+++ b/components/ui/Sidebar/Sidebar.tsx
@@ -28,7 +28,7 @@ const Sidebar: FC<SidebarProps> = ({ children, onClose }) => {
     }
 
     const contentElement = contentRef.current
-  
+
     if (contentElement) {
       disableBodyScroll(contentElement, { reserveScrollBarGap: true })
     }
diff --git a/components/ui/Text/Text.module.css b/components/ui/Text/Text.module.css
index b3bc8342b..dd35ff63b 100644
--- a/components/ui/Text/Text.module.css
+++ b/components/ui/Text/Text.module.css
@@ -14,7 +14,6 @@
   @apply pt-1 pb-2 text-2xl font-bold tracking-wide cursor-pointer mb-2;
 }
 
-
 /* Apply base font sizes and styles for typography markup (h2, h2, ul, p, etc.).
    A helpful addition for whenn page content is consumed from a source managed through a wysiwyg editor. */
 
diff --git a/framework/bigcommerce/api/endpoints/customer/get-logged-in-customer.ts b/framework/bigcommerce/api/endpoints/customer/get-logged-in-customer.ts
index cfcce9532..50bd5cf3f 100644
--- a/framework/bigcommerce/api/endpoints/customer/get-logged-in-customer.ts
+++ b/framework/bigcommerce/api/endpoints/customer/get-logged-in-customer.ts
@@ -24,36 +24,33 @@ export const getLoggedInCustomerQuery = /* GraphQL */ `
 
 export type Customer = NonNullable<GetLoggedInCustomerQuery['customer']>
 
-const getLoggedInCustomer: CustomerEndpoint['handlers']['getLoggedInCustomer'] = async ({
-  req,
-  res,
-  config,
-}) => {
-  const token = req.cookies[config.customerCookie]
+const getLoggedInCustomer: CustomerEndpoint['handlers']['getLoggedInCustomer'] =
+  async ({ req, res, config }) => {
+    const token = req.cookies[config.customerCookie]
 
-  if (token) {
-    const { data } = await config.fetch<GetLoggedInCustomerQuery>(
-      getLoggedInCustomerQuery,
-      undefined,
-      {
-        headers: {
-          cookie: `${config.customerCookie}=${token}`,
-        },
+    if (token) {
+      const { data } = await config.fetch<GetLoggedInCustomerQuery>(
+        getLoggedInCustomerQuery,
+        undefined,
+        {
+          headers: {
+            cookie: `${config.customerCookie}=${token}`,
+          },
+        }
+      )
+      const { customer } = data
+
+      if (!customer) {
+        return res.status(400).json({
+          data: null,
+          errors: [{ message: 'Customer not found', code: 'not_found' }],
+        })
       }
-    )
-    const { customer } = data
 
-    if (!customer) {
-      return res.status(400).json({
-        data: null,
-        errors: [{ message: 'Customer not found', code: 'not_found' }],
-      })
+      return res.status(200).json({ data: { customer } })
     }
 
-    return res.status(200).json({ data: { customer } })
+    res.status(200).json({ data: null })
   }
 
-  res.status(200).json({ data: null })
-}
-
 export default getLoggedInCustomer
diff --git a/framework/bigcommerce/api/index.ts b/framework/bigcommerce/api/index.ts
index 9dbe400f9..ecc0d0e0e 100644
--- a/framework/bigcommerce/api/index.ts
+++ b/framework/bigcommerce/api/index.ts
@@ -34,7 +34,7 @@ export interface BigcommerceConfig extends CommerceAPIConfig {
   storeChannelId?: string
   storeUrl?: string
   storeApiClientSecret?: string
-  storeHash?:string
+  storeHash?: string
   storeApiFetch<T>(endpoint: string, options?: RequestInit): Promise<T>
 }
 
@@ -81,8 +81,8 @@ const config: BigcommerceConfig = {
   storeApiToken: STORE_API_TOKEN,
   storeApiClientId: STORE_API_CLIENT_ID,
   storeChannelId: STORE_CHANNEL_ID,
-  storeUrl:STORE_URL,
-  storeApiClientSecret:CLIENT_SECRET,
+  storeUrl: STORE_URL,
+  storeApiClientSecret: CLIENT_SECRET,
   storeHash: STOREFRONT_HASH,
   storeApiFetch: createFetchStoreApi(() => getCommerceApi().getConfig()),
 }
diff --git a/framework/bigcommerce/auth/use-login.tsx b/framework/bigcommerce/auth/use-login.tsx
index d366b5260..a8c049603 100644
--- a/framework/bigcommerce/auth/use-login.tsx
+++ b/framework/bigcommerce/auth/use-login.tsx
@@ -15,8 +15,7 @@ export const handler: MutationHook<LoginHook> = {
   async fetcher({ input: { email, password }, options, fetch }) {
     if (!(email && password)) {
       throw new CommerceError({
-        message:
-          'An email and password are required to login',
+        message: 'An email and password are required to login',
       })
     }
 
@@ -25,16 +24,18 @@ export const handler: MutationHook<LoginHook> = {
       body: { email, password },
     })
   },
-  useHook: ({ fetch }) => () => {
-    const { revalidate } = useCustomer()
+  useHook:
+    ({ fetch }) =>
+    () => {
+      const { revalidate } = useCustomer()
 
-    return useCallback(
-      async function login(input) {
-        const data = await fetch({ input })
-        await revalidate()
-        return data
-      },
-      [fetch, revalidate]
-    )
-  },
+      return useCallback(
+        async function login(input) {
+          const data = await fetch({ input })
+          await revalidate()
+          return data
+        },
+        [fetch, revalidate]
+      )
+    },
 }
diff --git a/framework/bigcommerce/auth/use-logout.tsx b/framework/bigcommerce/auth/use-logout.tsx
index e75563e04..1e8e9c666 100644
--- a/framework/bigcommerce/auth/use-logout.tsx
+++ b/framework/bigcommerce/auth/use-logout.tsx
@@ -11,16 +11,18 @@ export const handler: MutationHook<LogoutHook> = {
     url: '/api/logout',
     method: 'GET',
   },
-  useHook: ({ fetch }) => () => {
-    const { mutate } = useCustomer()
+  useHook:
+    ({ fetch }) =>
+    () => {
+      const { mutate } = useCustomer()
 
-    return useCallback(
-      async function logout() {
-        const data = await fetch()
-        await mutate(null, false)
-        return data
-      },
-      [fetch, mutate]
-    )
-  },
+      return useCallback(
+        async function logout() {
+          const data = await fetch()
+          await mutate(null, false)
+          return data
+        },
+        [fetch, mutate]
+      )
+    },
 }
diff --git a/framework/bigcommerce/auth/use-signup.tsx b/framework/bigcommerce/auth/use-signup.tsx
index da06fd3eb..8f183685f 100644
--- a/framework/bigcommerce/auth/use-signup.tsx
+++ b/framework/bigcommerce/auth/use-signup.tsx
@@ -29,16 +29,18 @@ export const handler: MutationHook<SignupHook> = {
       body: { firstName, lastName, email, password },
     })
   },
-  useHook: ({ fetch }) => () => {
-    const { revalidate } = useCustomer()
+  useHook:
+    ({ fetch }) =>
+    () => {
+      const { revalidate } = useCustomer()
 
-    return useCallback(
-      async function signup(input) {
-        const data = await fetch({ input })
-        await revalidate()
-        return data
-      },
-      [fetch, revalidate]
-    )
-  },
+      return useCallback(
+        async function signup(input) {
+          const data = await fetch({ input })
+          await revalidate()
+          return data
+        },
+        [fetch, revalidate]
+      )
+    },
 }
diff --git a/framework/bigcommerce/cart/use-add-item.tsx b/framework/bigcommerce/cart/use-add-item.tsx
index 441d32775..bdad1862c 100644
--- a/framework/bigcommerce/cart/use-add-item.tsx
+++ b/framework/bigcommerce/cart/use-add-item.tsx
@@ -29,16 +29,18 @@ export const handler: MutationHook<AddItemHook> = {
 
     return data
   },
-  useHook: ({ fetch }) => () => {
-    const { mutate } = useCart()
+  useHook:
+    ({ fetch }) =>
+    () => {
+      const { mutate } = useCart()
 
-    return useCallback(
-      async function addItem(input) {
-        const data = await fetch({ input })
-        await mutate(data, false)
-        return data
-      },
-      [fetch, mutate]
-    )
-  },
-}
\ No newline at end of file
+      return useCallback(
+        async function addItem(input) {
+          const data = await fetch({ input })
+          await mutate(data, false)
+          return data
+        },
+        [fetch, mutate]
+      )
+    },
+}
diff --git a/framework/bigcommerce/cart/use-cart.tsx b/framework/bigcommerce/cart/use-cart.tsx
index 4ba1724d9..53fd3471c 100644
--- a/framework/bigcommerce/cart/use-cart.tsx
+++ b/framework/bigcommerce/cart/use-cart.tsx
@@ -10,22 +10,24 @@ export const handler: SWRHook<GetCartHook> = {
     url: '/api/cart',
     method: 'GET',
   },
-  useHook: ({ useData }) => (input) => {
-    const response = useData({
-      swrOptions: { revalidateOnFocus: false, ...input?.swrOptions },
-    })
+  useHook:
+    ({ useData }) =>
+    (input) => {
+      const response = useData({
+        swrOptions: { revalidateOnFocus: false, ...input?.swrOptions },
+      })
 
-    return useMemo(
-      () =>
-        Object.create(response, {
-          isEmpty: {
-            get() {
-              return (response.data?.lineItems.length ?? 0) <= 0
+      return useMemo(
+        () =>
+          Object.create(response, {
+            isEmpty: {
+              get() {
+                return (response.data?.lineItems.length ?? 0) <= 0
+              },
+              enumerable: true,
             },
-            enumerable: true,
-          },
-        }),
-      [response]
-    )
-  },
+          }),
+        [response]
+      )
+    },
 }
diff --git a/framework/bigcommerce/cart/use-remove-item.tsx b/framework/bigcommerce/cart/use-remove-item.tsx
index 1376f29ce..daf155c26 100644
--- a/framework/bigcommerce/cart/use-remove-item.tsx
+++ b/framework/bigcommerce/cart/use-remove-item.tsx
@@ -30,27 +30,25 @@ export const handler = {
   }: HookFetcherContext<RemoveItemHook>) {
     return await fetch({ ...options, body: { itemId } })
   },
-  useHook: ({ fetch }: MutationHookContext<RemoveItemHook>) => <
-    T extends LineItem | undefined = undefined
-  >(
-    ctx: { item?: T } = {}
-  ) => {
-    const { item } = ctx
-    const { mutate } = useCart()
-    const removeItem: RemoveItemFn<LineItem> = async (input) => {
-      const itemId = input?.id ?? item?.id
+  useHook:
+    ({ fetch }: MutationHookContext<RemoveItemHook>) =>
+    <T extends LineItem | undefined = undefined>(ctx: { item?: T } = {}) => {
+      const { item } = ctx
+      const { mutate } = useCart()
+      const removeItem: RemoveItemFn<LineItem> = async (input) => {
+        const itemId = input?.id ?? item?.id
 
-      if (!itemId) {
-        throw new ValidationError({
-          message: 'Invalid input used for this operation',
-        })
+        if (!itemId) {
+          throw new ValidationError({
+            message: 'Invalid input used for this operation',
+          })
+        }
+
+        const data = await fetch({ input: { itemId } })
+        await mutate(data, false)
+        return data
       }
 
-      const data = await fetch({ input: { itemId } })
-      await mutate(data, false)
-      return data
-    }
-
-    return useCallback(removeItem as RemoveItemFn<T>, [fetch, mutate])
-  },
+      return useCallback(removeItem as RemoveItemFn<T>, [fetch, mutate])
+    },
 }
diff --git a/framework/bigcommerce/cart/use-update-item.tsx b/framework/bigcommerce/cart/use-update-item.tsx
index 0f9f5754d..a4c7d178e 100644
--- a/framework/bigcommerce/cart/use-update-item.tsx
+++ b/framework/bigcommerce/cart/use-update-item.tsx
@@ -46,39 +46,39 @@ export const handler = {
       body: { itemId, item },
     })
   },
-  useHook: ({ fetch }: MutationHookContext<UpdateItemHook>) => <
-    T extends LineItem | undefined = undefined
-  >(
-    ctx: {
-      item?: T
-      wait?: number
-    } = {}
-  ) => {
-    const { item } = ctx
-    const { mutate } = useCart() as any
+  useHook:
+    ({ fetch }: MutationHookContext<UpdateItemHook>) =>
+    <T extends LineItem | undefined = undefined>(
+      ctx: {
+        item?: T
+        wait?: number
+      } = {}
+    ) => {
+      const { item } = ctx
+      const { mutate } = useCart() as any
 
-    return useCallback(
-      debounce(async (input: UpdateItemActionInput<T>) => {
-        const itemId = input.id ?? item?.id
-        const productId = input.productId ?? item?.productId
-        const variantId = input.productId ?? item?.variantId
+      return useCallback(
+        debounce(async (input: UpdateItemActionInput<T>) => {
+          const itemId = input.id ?? item?.id
+          const productId = input.productId ?? item?.productId
+          const variantId = input.productId ?? item?.variantId
 
-        if (!itemId || !productId || !variantId) {
-          throw new ValidationError({
-            message: 'Invalid input used for this operation',
+          if (!itemId || !productId || !variantId) {
+            throw new ValidationError({
+              message: 'Invalid input used for this operation',
+            })
+          }
+
+          const data = await fetch({
+            input: {
+              itemId,
+              item: { productId, variantId, quantity: input.quantity },
+            },
           })
-        }
-
-        const data = await fetch({
-          input: {
-            itemId,
-            item: { productId, variantId, quantity: input.quantity },
-          },
-        })
-        await mutate(data, false)
-        return data
-      }, ctx.wait ?? 500),
-      [fetch, mutate]
-    )
-  },
+          await mutate(data, false)
+          return data
+        }, ctx.wait ?? 500),
+        [fetch, mutate]
+      )
+    },
 }
diff --git a/framework/bigcommerce/customer/use-customer.tsx b/framework/bigcommerce/customer/use-customer.tsx
index 238b1229b..ddecc2fcf 100644
--- a/framework/bigcommerce/customer/use-customer.tsx
+++ b/framework/bigcommerce/customer/use-customer.tsx
@@ -13,12 +13,14 @@ export const handler: SWRHook<CustomerHook> = {
     const data = await fetch(options)
     return data?.customer ?? null
   },
-  useHook: ({ useData }) => (input) => {
-    return useData({
-      swrOptions: {
-        revalidateOnFocus: false,
-        ...input?.swrOptions,
-      },
-    })
-  },
+  useHook:
+    ({ useData }) =>
+    (input) => {
+      return useData({
+        swrOptions: {
+          revalidateOnFocus: false,
+          ...input?.swrOptions,
+        },
+      })
+    },
 }
diff --git a/framework/bigcommerce/lib/normalize.ts b/framework/bigcommerce/lib/normalize.ts
index 5cdda49d7..059e3f871 100644
--- a/framework/bigcommerce/lib/normalize.ts
+++ b/framework/bigcommerce/lib/normalize.ts
@@ -8,11 +8,7 @@ import getSlug from './get-slug'
 
 function normalizeProductOption(productOption: any) {
   const {
-    node: {
-      entityId,
-      values: { edges = [] } = {},
-      ...rest
-    },
+    node: { entityId, values: { edges = [] } = {}, ...rest },
   } = productOption
 
   return {
diff --git a/framework/bigcommerce/product/use-search.tsx b/framework/bigcommerce/product/use-search.tsx
index cd6c34612..76fab00a4 100644
--- a/framework/bigcommerce/product/use-search.tsx
+++ b/framework/bigcommerce/product/use-search.tsx
@@ -33,18 +33,20 @@ export const handler: SWRHook<SearchProductsHook> = {
       method: options.method,
     })
   },
-  useHook: ({ useData }) => (input = {}) => {
-    return useData({
-      input: [
-        ['search', input.search],
-        ['categoryId', input.categoryId],
-        ['brandId', input.brandId],
-        ['sort', input.sort],
-      ],
-      swrOptions: {
-        revalidateOnFocus: false,
-        ...input.swrOptions,
-      },
-    })
-  },
+  useHook:
+    ({ useData }) =>
+    (input = {}) => {
+      return useData({
+        input: [
+          ['search', input.search],
+          ['categoryId', input.categoryId],
+          ['brandId', input.brandId],
+          ['sort', input.sort],
+        ],
+        swrOptions: {
+          revalidateOnFocus: false,
+          ...input.swrOptions,
+        },
+      })
+    },
 }
diff --git a/framework/bigcommerce/types/wishlist.ts b/framework/bigcommerce/types/wishlist.ts
index 1e148b88c..9e9c52353 100644
--- a/framework/bigcommerce/types/wishlist.ts
+++ b/framework/bigcommerce/types/wishlist.ts
@@ -20,4 +20,5 @@ export type WishlistTypes = {
 }
 
 export type WishlistSchema = Core.WishlistSchema<WishlistTypes>
-export type GetCustomerWishlistOperation = Core.GetCustomerWishlistOperation<WishlistTypes>
+export type GetCustomerWishlistOperation =
+  Core.GetCustomerWishlistOperation<WishlistTypes>
diff --git a/framework/bigcommerce/wishlist/use-add-item.tsx b/framework/bigcommerce/wishlist/use-add-item.tsx
index 1bf086731..6b3f7778d 100644
--- a/framework/bigcommerce/wishlist/use-add-item.tsx
+++ b/framework/bigcommerce/wishlist/use-add-item.tsx
@@ -13,25 +13,27 @@ export const handler: MutationHook<AddItemHook> = {
     url: '/api/wishlist',
     method: 'POST',
   },
-  useHook: ({ fetch }) => () => {
-    const { data: customer } = useCustomer()
-    const { revalidate } = useWishlist()
+  useHook:
+    ({ fetch }) =>
+    () => {
+      const { data: customer } = useCustomer()
+      const { revalidate } = useWishlist()
 
-    return useCallback(
-      async function addItem(item) {
-        if (!customer) {
-          // A signed customer is required in order to have a wishlist
-          throw new CommerceError({
-            message: 'Signed customer not found',
-          })
-        }
+      return useCallback(
+        async function addItem(item) {
+          if (!customer) {
+            // A signed customer is required in order to have a wishlist
+            throw new CommerceError({
+              message: 'Signed customer not found',
+            })
+          }
 
-        // TODO: add validations before doing the fetch
-        const data = await fetch({ input: { item } })
-        await revalidate()
-        return data
-      },
-      [fetch, revalidate, customer]
-    )
-  },
+          // TODO: add validations before doing the fetch
+          const data = await fetch({ input: { item } })
+          await revalidate()
+          return data
+        },
+        [fetch, revalidate, customer]
+      )
+    },
 }
diff --git a/framework/bigcommerce/wishlist/use-remove-item.tsx b/framework/bigcommerce/wishlist/use-remove-item.tsx
index 9d25c1439..bb8e6415e 100644
--- a/framework/bigcommerce/wishlist/use-remove-item.tsx
+++ b/framework/bigcommerce/wishlist/use-remove-item.tsx
@@ -15,24 +15,26 @@ export const handler: MutationHook<RemoveItemHook> = {
     url: '/api/wishlist',
     method: 'DELETE',
   },
-  useHook: ({ fetch }) => ({ wishlist } = {}) => {
-    const { data: customer } = useCustomer()
-    const { revalidate } = useWishlist(wishlist)
+  useHook:
+    ({ fetch }) =>
+    ({ wishlist } = {}) => {
+      const { data: customer } = useCustomer()
+      const { revalidate } = useWishlist(wishlist)
 
-    return useCallback(
-      async function removeItem(input) {
-        if (!customer) {
-          // A signed customer is required in order to have a wishlist
-          throw new CommerceError({
-            message: 'Signed customer not found',
-          })
-        }
+      return useCallback(
+        async function removeItem(input) {
+          if (!customer) {
+            // A signed customer is required in order to have a wishlist
+            throw new CommerceError({
+              message: 'Signed customer not found',
+            })
+          }
 
-        const data = await fetch({ input: { itemId: String(input.id) } })
-        await revalidate()
-        return data
-      },
-      [fetch, revalidate, customer]
-    )
-  },
+          const data = await fetch({ input: { itemId: String(input.id) } })
+          await revalidate()
+          return data
+        },
+        [fetch, revalidate, customer]
+      )
+    },
 }
diff --git a/framework/bigcommerce/wishlist/use-wishlist.tsx b/framework/bigcommerce/wishlist/use-wishlist.tsx
index b8fc946e3..7c09f835a 100644
--- a/framework/bigcommerce/wishlist/use-wishlist.tsx
+++ b/framework/bigcommerce/wishlist/use-wishlist.tsx
@@ -24,30 +24,32 @@ export const handler: SWRHook<GetWishlistHook> = {
       method: options.method,
     })
   },
-  useHook: ({ useData }) => (input) => {
-    const { data: customer } = useCustomer()
-    const response = useData({
-      input: [
-        ['customerId', customer?.entityId],
-        ['includeProducts', input?.includeProducts],
-      ],
-      swrOptions: {
-        revalidateOnFocus: false,
-        ...input?.swrOptions,
-      },
-    })
+  useHook:
+    ({ useData }) =>
+    (input) => {
+      const { data: customer } = useCustomer()
+      const response = useData({
+        input: [
+          ['customerId', customer?.entityId],
+          ['includeProducts', input?.includeProducts],
+        ],
+        swrOptions: {
+          revalidateOnFocus: false,
+          ...input?.swrOptions,
+        },
+      })
 
-    return useMemo(
-      () =>
-        Object.create(response, {
-          isEmpty: {
-            get() {
-              return (response.data?.items?.length || 0) <= 0
+      return useMemo(
+        () =>
+          Object.create(response, {
+            isEmpty: {
+              get() {
+                return (response.data?.items?.length || 0) <= 0
+              },
+              enumerable: true,
             },
-            enumerable: true,
-          },
-        }),
-      [response]
-    )
-  },
+          }),
+        [response]
+      )
+    },
 }
diff --git a/framework/commerce/api/endpoints/cart.ts b/framework/commerce/api/endpoints/cart.ts
index ca39e7da3..abd5df492 100644
--- a/framework/commerce/api/endpoints/cart.ts
+++ b/framework/commerce/api/endpoints/cart.ts
@@ -3,60 +3,58 @@ import { CommerceAPIError } from '../utils/errors'
 import isAllowedOperation from '../utils/is-allowed-operation'
 import type { GetAPISchema } from '..'
 
-const cartEndpoint: GetAPISchema<
-  any,
-  CartSchema<any>
->['endpoint']['handler'] = async (ctx) => {
-  const { req, res, handlers, config } = ctx
+const cartEndpoint: GetAPISchema<any, CartSchema<any>>['endpoint']['handler'] =
+  async (ctx) => {
+    const { req, res, handlers, config } = ctx
 
-  if (
-    !isAllowedOperation(req, res, {
-      GET: handlers['getCart'],
-      POST: handlers['addItem'],
-      PUT: handlers['updateItem'],
-      DELETE: handlers['removeItem'],
-    })
-  ) {
-    return
+    if (
+      !isAllowedOperation(req, res, {
+        GET: handlers['getCart'],
+        POST: handlers['addItem'],
+        PUT: handlers['updateItem'],
+        DELETE: handlers['removeItem'],
+      })
+    ) {
+      return
+    }
+
+    const { cookies } = req
+    const cartId = cookies[config.cartCookie]
+
+    try {
+      // Return current cart info
+      if (req.method === 'GET') {
+        const body = { cartId }
+        return await handlers['getCart']({ ...ctx, body })
+      }
+
+      // Create or add an item to the cart
+      if (req.method === 'POST') {
+        const body = { ...req.body, cartId }
+        return await handlers['addItem']({ ...ctx, body })
+      }
+
+      // Update item in cart
+      if (req.method === 'PUT') {
+        const body = { ...req.body, cartId }
+        return await handlers['updateItem']({ ...ctx, body })
+      }
+
+      // Remove an item from the cart
+      if (req.method === 'DELETE') {
+        const body = { ...req.body, cartId }
+        return await handlers['removeItem']({ ...ctx, body })
+      }
+    } catch (error) {
+      console.error(error)
+
+      const message =
+        error instanceof CommerceAPIError
+          ? 'An unexpected error ocurred with the Commerce API'
+          : 'An unexpected error ocurred'
+
+      res.status(500).json({ data: null, errors: [{ message }] })
+    }
   }
 
-  const { cookies } = req
-  const cartId = cookies[config.cartCookie]
-
-  try {
-    // Return current cart info
-    if (req.method === 'GET') {
-      const body = { cartId }
-      return await handlers['getCart']({ ...ctx, body })
-    }
-
-    // Create or add an item to the cart
-    if (req.method === 'POST') {
-      const body = { ...req.body, cartId }
-      return await handlers['addItem']({ ...ctx, body })
-    }
-
-    // Update item in cart
-    if (req.method === 'PUT') {
-      const body = { ...req.body, cartId }
-      return await handlers['updateItem']({ ...ctx, body })
-    }
-
-    // Remove an item from the cart
-    if (req.method === 'DELETE') {
-      const body = { ...req.body, cartId }
-      return await handlers['removeItem']({ ...ctx, body })
-    }
-  } catch (error) {
-    console.error(error)
-
-    const message =
-      error instanceof CommerceAPIError
-        ? 'An unexpected error ocurred with the Commerce API'
-        : 'An unexpected error ocurred'
-
-    res.status(500).json({ data: null, errors: [{ message }] })
-  }
-}
-
 export default cartEndpoint
diff --git a/framework/commerce/api/endpoints/logout.ts b/framework/commerce/api/endpoints/logout.ts
index 8da11acb0..c2640eac3 100644
--- a/framework/commerce/api/endpoints/logout.ts
+++ b/framework/commerce/api/endpoints/logout.ts
@@ -3,35 +3,33 @@ import { CommerceAPIError } from '../utils/errors'
 import isAllowedOperation from '../utils/is-allowed-operation'
 import type { GetAPISchema } from '..'
 
-const logoutEndpoint: GetAPISchema<
-  any,
-  LogoutSchema
->['endpoint']['handler'] = async (ctx) => {
-  const { req, res, handlers } = ctx
+const logoutEndpoint: GetAPISchema<any, LogoutSchema>['endpoint']['handler'] =
+  async (ctx) => {
+    const { req, res, handlers } = ctx
 
-  if (
-    !isAllowedOperation(req, res, {
-      GET: handlers['logout'],
-    })
-  ) {
-    return
+    if (
+      !isAllowedOperation(req, res, {
+        GET: handlers['logout'],
+      })
+    ) {
+      return
+    }
+
+    try {
+      const redirectTo = req.query.redirect_to
+      const body = typeof redirectTo === 'string' ? { redirectTo } : {}
+
+      return await handlers['logout']({ ...ctx, body })
+    } catch (error) {
+      console.error(error)
+
+      const message =
+        error instanceof CommerceAPIError
+          ? 'An unexpected error ocurred with the Commerce API'
+          : 'An unexpected error ocurred'
+
+      res.status(500).json({ data: null, errors: [{ message }] })
+    }
   }
 
-  try {
-    const redirectTo = req.query.redirect_to
-    const body = typeof redirectTo === 'string' ? { redirectTo } : {}
-
-    return await handlers['logout']({ ...ctx, body })
-  } catch (error) {
-    console.error(error)
-
-    const message =
-      error instanceof CommerceAPIError
-        ? 'An unexpected error ocurred with the Commerce API'
-        : 'An unexpected error ocurred'
-
-    res.status(500).json({ data: null, errors: [{ message }] })
-  }
-}
-
 export default logoutEndpoint
diff --git a/framework/commerce/api/endpoints/signup.ts b/framework/commerce/api/endpoints/signup.ts
index aa73ae739..78c4cf588 100644
--- a/framework/commerce/api/endpoints/signup.ts
+++ b/framework/commerce/api/endpoints/signup.ts
@@ -3,36 +3,34 @@ import { CommerceAPIError } from '../utils/errors'
 import isAllowedOperation from '../utils/is-allowed-operation'
 import type { GetAPISchema } from '..'
 
-const signupEndpoint: GetAPISchema<
-  any,
-  SignupSchema
->['endpoint']['handler'] = async (ctx) => {
-  const { req, res, handlers, config } = ctx
+const signupEndpoint: GetAPISchema<any, SignupSchema>['endpoint']['handler'] =
+  async (ctx) => {
+    const { req, res, handlers, config } = ctx
 
-  if (
-    !isAllowedOperation(req, res, {
-      POST: handlers['signup'],
-    })
-  ) {
-    return
+    if (
+      !isAllowedOperation(req, res, {
+        POST: handlers['signup'],
+      })
+    ) {
+      return
+    }
+
+    const { cookies } = req
+    const cartId = cookies[config.cartCookie]
+
+    try {
+      const body = { ...req.body, cartId }
+      return await handlers['signup']({ ...ctx, body })
+    } catch (error) {
+      console.error(error)
+
+      const message =
+        error instanceof CommerceAPIError
+          ? 'An unexpected error ocurred with the Commerce API'
+          : 'An unexpected error ocurred'
+
+      res.status(500).json({ data: null, errors: [{ message }] })
+    }
   }
 
-  const { cookies } = req
-  const cartId = cookies[config.cartCookie]
-
-  try {
-    const body = { ...req.body, cartId }
-    return await handlers['signup']({ ...ctx, body })
-  } catch (error) {
-    console.error(error)
-
-    const message =
-      error instanceof CommerceAPIError
-        ? 'An unexpected error ocurred with the Commerce API'
-        : 'An unexpected error ocurred'
-
-    res.status(500).json({ data: null, errors: [{ message }] })
-  }
-}
-
 export default signupEndpoint
diff --git a/framework/commerce/types/customer/index.ts b/framework/commerce/types/customer/index.ts
index 70c437c29..f0b210f62 100644
--- a/framework/commerce/types/customer/index.ts
+++ b/framework/commerce/types/customer/index.ts
@@ -1,5 +1,5 @@
-export * as Card from "./card"
-export * as Address from "./address"
+export * as Card from './card'
+export * as Address from './address'
 
 // TODO: define this type
 export type Customer = any
diff --git a/framework/commerce/types/product.ts b/framework/commerce/types/product.ts
index 6a68d8ad1..400ac4160 100644
--- a/framework/commerce/types/product.ts
+++ b/framework/commerce/types/product.ts
@@ -77,12 +77,11 @@ export type ProductsSchema<T extends ProductTypes = ProductTypes> = {
   }
 }
 
-export type GetAllProductPathsOperation<
-  T extends ProductTypes = ProductTypes
-> = {
-  data: { products: Pick<T['product'], 'path'>[] }
-  variables: { first?: number }
-}
+export type GetAllProductPathsOperation<T extends ProductTypes = ProductTypes> =
+  {
+    data: { products: Pick<T['product'], 'path'>[] }
+    variables: { first?: number }
+  }
 
 export type GetAllProductsOperation<T extends ProductTypes = ProductTypes> = {
   data: { products: T['product'][] }
diff --git a/framework/commerce/utils/define-property.ts b/framework/commerce/utils/define-property.ts
index 875aaaa82..e89735226 100644
--- a/framework/commerce/utils/define-property.ts
+++ b/framework/commerce/utils/define-property.ts
@@ -11,16 +11,18 @@ type InferValue<Prop extends PropertyKey, Desc> = Desc extends {
   ? Record<Prop, T>
   : never
 
-type DefineProperty<Prop extends PropertyKey, Desc extends PropertyDescriptor> =
-  Desc extends { writable: any; set(val: any): any }
-    ? never
-    : Desc extends { writable: any; get(): any }
-    ? never
-    : Desc extends { writable: false }
-    ? Readonly<InferValue<Prop, Desc>>
-    : Desc extends { writable: true }
-    ? InferValue<Prop, Desc>
-    : Readonly<InferValue<Prop, Desc>>
+type DefineProperty<
+  Prop extends PropertyKey,
+  Desc extends PropertyDescriptor
+> = Desc extends { writable: any; set(val: any): any }
+  ? never
+  : Desc extends { writable: any; get(): any }
+  ? never
+  : Desc extends { writable: false }
+  ? Readonly<InferValue<Prop, Desc>>
+  : Desc extends { writable: true }
+  ? InferValue<Prop, Desc>
+  : Readonly<InferValue<Prop, Desc>>
 
 export default function defineProperty<
   Obj extends object,
diff --git a/framework/ordercloud/api/endpoints/customer/address/index.ts b/framework/ordercloud/api/endpoints/customer/address/index.ts
index 385bc57f1..0691fd1db 100644
--- a/framework/ordercloud/api/endpoints/customer/address/index.ts
+++ b/framework/ordercloud/api/endpoints/customer/address/index.ts
@@ -9,7 +9,10 @@ import addItem from './add-item'
 import updateItem from './update-item'
 import removeItem from './remove-item'
 
-export type CustomerAddressAPI = GetAPISchema<OrdercloudAPI, CustomerAddressSchema>
+export type CustomerAddressAPI = GetAPISchema<
+  OrdercloudAPI,
+  CustomerAddressSchema
+>
 export type CustomerAddressEndpoint = CustomerAddressAPI['endpoint']
 
 export const handlers: CustomerAddressEndpoint['handlers'] = {
diff --git a/framework/ordercloud/api/operations/get-page.ts b/framework/ordercloud/api/operations/get-page.ts
index 6b0a86a4d..529f130e2 100644
--- a/framework/ordercloud/api/operations/get-page.ts
+++ b/framework/ordercloud/api/operations/get-page.ts
@@ -1,4 +1,4 @@
-import { GetPageOperation } from "@commerce/types/page"
+import { GetPageOperation } from '@commerce/types/page'
 
 export type Page = any
 export type GetPageResult = { page?: Page }
diff --git a/framework/ordercloud/checkout/use-checkout.tsx b/framework/ordercloud/checkout/use-checkout.tsx
index 6ce13dbb6..f9892bbc1 100644
--- a/framework/ordercloud/checkout/use-checkout.tsx
+++ b/framework/ordercloud/checkout/use-checkout.tsx
@@ -14,7 +14,7 @@ export const handler: SWRHook<GetCheckoutHook> = {
   },
   useHook: ({ useData }) =>
     function useHook(input) {
-      const submit = useSubmitCheckout();
+      const submit = useSubmitCheckout()
       const response = useData({
         swrOptions: { revalidateOnFocus: false, ...input?.swrOptions },
       })
diff --git a/framework/ordercloud/checkout/use-submit-checkout.tsx b/framework/ordercloud/checkout/use-submit-checkout.tsx
index 47644de8e..91d734208 100644
--- a/framework/ordercloud/checkout/use-submit-checkout.tsx
+++ b/framework/ordercloud/checkout/use-submit-checkout.tsx
@@ -2,7 +2,9 @@ import type { SubmitCheckoutHook } from '@commerce/types/checkout'
 import type { MutationHook } from '@commerce/utils/types'
 
 import { useCallback } from 'react'
-import useSubmitCheckout, { UseSubmitCheckout } from '@commerce/checkout/use-submit-checkout'
+import useSubmitCheckout, {
+  UseSubmitCheckout,
+} from '@commerce/checkout/use-submit-checkout'
 
 export default useSubmitCheckout as UseSubmitCheckout<typeof handler>
 
diff --git a/framework/ordercloud/product/use-search.tsx b/framework/ordercloud/product/use-search.tsx
index 4b39fefb4..390e84ba1 100644
--- a/framework/ordercloud/product/use-search.tsx
+++ b/framework/ordercloud/product/use-search.tsx
@@ -12,7 +12,6 @@ export const handler: SWRHook<SearchProductsHook> = {
     // Use a dummy base as we only care about the relative path
     const url = new URL(options.url!, 'http://a')
 
-
     if (search) url.searchParams.set('search', String(search))
     if (categoryId) url.searchParams.set('categoryId', String(categoryId))
     if (brandId) url.searchParams.set('brandId', String(brandId))
@@ -23,18 +22,20 @@ export const handler: SWRHook<SearchProductsHook> = {
       method: options.method,
     })
   },
-  useHook: ({ useData }) => (input = {}) => {
-    return useData({
-      input: [
-        ['search', input.search],
-        ['categoryId', input.categoryId],
-        ['brandId', input.brandId],
-        ['sort', input.sort]
-      ],
-      swrOptions: {
-        revalidateOnFocus: false,
-        ...input.swrOptions,
-      },
-    })
-  },
+  useHook:
+    ({ useData }) =>
+    (input = {}) => {
+      return useData({
+        input: [
+          ['search', input.search],
+          ['categoryId', input.categoryId],
+          ['brandId', input.brandId],
+          ['sort', input.sort],
+        ],
+        swrOptions: {
+          revalidateOnFocus: false,
+          ...input.swrOptions,
+        },
+      })
+    },
 }
diff --git a/framework/ordercloud/provider.ts b/framework/ordercloud/provider.ts
index 337eed657..7ae3f1d24 100644
--- a/framework/ordercloud/provider.ts
+++ b/framework/ordercloud/provider.ts
@@ -34,7 +34,7 @@ export const ordercloudProvider = {
     useCart,
     useAddItem: useAddCartItem,
     useUpdateItem: useUpdateCartItem,
-    useRemoveItem: useRemoveCartItem
+    useRemoveItem: useRemoveCartItem,
   },
   checkout: {
     useCheckout,
@@ -46,14 +46,14 @@ export const ordercloudProvider = {
       useCards,
       useAddItem: useAddCardItem,
       useUpdateItem: useUpdateCardItem,
-      useRemoveItem: useRemoveCardItem
+      useRemoveItem: useRemoveCardItem,
     },
     address: {
       useAddresses,
       useAddItem: useAddAddressItem,
       useUpdateItem: useUpdateAddressItem,
-      useRemoveItem: useRemoveAddressItem
-    }
+      useRemoveItem: useRemoveAddressItem,
+    },
   },
   products: { useSearch },
   auth: { useLogin, useLogout, useSignup },
diff --git a/framework/ordercloud/types/customer/address.ts b/framework/ordercloud/types/customer/address.ts
index 3aaddc9a2..9c7f4bd33 100644
--- a/framework/ordercloud/types/customer/address.ts
+++ b/framework/ordercloud/types/customer/address.ts
@@ -1,31 +1,32 @@
 import * as Core from '@commerce/types/customer/address'
 
 export type CustomerAddressTypes = Core.CustomerAddressTypes
-export type CustomerAddressSchema = Core.CustomerAddressSchema<CustomerAddressTypes>
+export type CustomerAddressSchema =
+  Core.CustomerAddressSchema<CustomerAddressTypes>
 
 export interface OrdercloudAddress {
-  ID: string;
-  "FromCompanyID": string;
-	"ToCompanyID": string;
-	"FromUserID": string;
-	"BillingAddressID": null,
-	"BillingAddress": null,
-	"ShippingAddressID": null,
-	"Comments": null,
-	"LineItemCount": number;
-	"Status": string;
-	"DateCreated": string;
-	"DateSubmitted": null,
-	"DateApproved": null,
-	"DateDeclined": null,
-	"DateCanceled": null,
-	"DateCompleted": null,
-	"LastUpdated": string;
-	"Subtotal": number
-	"ShippingCost": number
-	"TaxCost": number
-	"PromotionDiscount": number
-	"Total": number
-	"IsSubmitted": false,
-	"xp": null
+  ID: string
+  FromCompanyID: string
+  ToCompanyID: string
+  FromUserID: string
+  BillingAddressID: null
+  BillingAddress: null
+  ShippingAddressID: null
+  Comments: null
+  LineItemCount: number
+  Status: string
+  DateCreated: string
+  DateSubmitted: null
+  DateApproved: null
+  DateDeclined: null
+  DateCanceled: null
+  DateCompleted: null
+  LastUpdated: string
+  Subtotal: number
+  ShippingCost: number
+  TaxCost: number
+  PromotionDiscount: number
+  Total: number
+  IsSubmitted: false
+  xp: null
 }
diff --git a/framework/ordercloud/types/customer/card.ts b/framework/ordercloud/types/customer/card.ts
index eb1abffbb..6bf575332 100644
--- a/framework/ordercloud/types/customer/card.ts
+++ b/framework/ordercloud/types/customer/card.ts
@@ -4,13 +4,13 @@ export type CustomerCardTypes = Core.CustomerCardTypes
 export type CustomerCardSchema = Core.CustomerCardSchema<CustomerCardTypes>
 
 export interface OredercloudCreditCard {
-  "ID": string;
-	"Editable": boolean;
-	"Token": string;
-	"DateCreated": string;
-	"CardType": string;
-	"PartialAccountNumber": string;
-	"CardholderName": string;
-	"ExpirationDate": string;
-	"xp": null
+  ID: string
+  Editable: boolean
+  Token: string
+  DateCreated: string
+  CardType: string
+  PartialAccountNumber: string
+  CardholderName: string
+  ExpirationDate: string
+  xp: null
 }
diff --git a/framework/saleor/README.md b/framework/saleor/README.md
index 00af272b0..dba25a243 100644
--- a/framework/saleor/README.md
+++ b/framework/saleor/README.md
@@ -12,7 +12,7 @@ Copy the `.env.template` file in this directory to `.env.local` in the main dire
 cp framework/saleor/.env.template .env.local
 ```
 
-Then, set the environment following variables in your `.env.local`. Both, `NEXT_PUBLIC_SALEOR_API_URL` and `COMMERCE_IMAGE_HOST` must point to your own Saleor instance.  
+Then, set the environment following variables in your `.env.local`. Both, `NEXT_PUBLIC_SALEOR_API_URL` and `COMMERCE_IMAGE_HOST` must point to your own Saleor instance.
 
 ```
 COMMERCE_PROVIDER=saleor
diff --git a/framework/saleor/api/operations/get-all-pages.ts b/framework/saleor/api/operations/get-all-pages.ts
index f3ed54e27..7ba07450d 100644
--- a/framework/saleor/api/operations/get-all-pages.ts
+++ b/framework/saleor/api/operations/get-all-pages.ts
@@ -6,14 +6,9 @@ import * as Query from '../../utils/queries'
 
 export type Page = any
 
- export type GetAllPagesResult<
-   T extends { pages: any[] } = { pages: Page[] }
- > = T
-
-export default function getAllPagesOperation({
-  commerce,
-}: OperationContext<Provider>) {
+export type GetAllPagesResult<T extends { pages: any[] } = { pages: Page[] }> = T
 
+export default function getAllPagesOperation({ commerce }: OperationContext<Provider>) {
   async function getAllPages({
     query = Query.PageMany,
     config,
@@ -27,7 +22,9 @@ export default function getAllPagesOperation({
   } = {}): Promise<GetAllPagesResult> {
     const { fetch, locale, locales = ['en-US'] } = commerce.getConfig(config)
 
-    const { data } = await fetch(query, { variables },
+    const { data } = await fetch(
+      query,
+      { variables },
       {
         ...(locale && {
           headers: {
@@ -42,7 +39,7 @@ export default function getAllPagesOperation({
       url: `/${locale}/${slug}`,
       name,
     }))
-  
+
     return { pages }
   }
 
diff --git a/framework/saleor/api/operations/get-all-products.ts b/framework/saleor/api/operations/get-all-products.ts
index a1a7ce0c9..4cb7555d6 100644
--- a/framework/saleor/api/operations/get-all-products.ts
+++ b/framework/saleor/api/operations/get-all-products.ts
@@ -12,9 +12,7 @@ type ReturnType = {
   products: Product[]
 }
 
-export default function getAllProductsOperation({
-  commerce,
-}: OperationContext<Provider>) {
+export default function getAllProductsOperation({ commerce }: OperationContext<Provider>) {
   async function getAllProducts({
     query = Query.ProductMany,
     variables,
@@ -22,7 +20,7 @@ export default function getAllProductsOperation({
     featured,
   }: {
     query?: string
-    variables?: any 
+    variables?: any
     config?: Partial<SaleorConfig>
     preview?: boolean
     featured?: boolean
@@ -30,10 +28,9 @@ export default function getAllProductsOperation({
     const { fetch, locale } = commerce.getConfig(config)
 
     if (featured) {
-      variables = { ...variables, categoryId: 'Q29sbGVjdGlvbjo0' };
+      variables = { ...variables, categoryId: 'Q29sbGVjdGlvbjo0' }
       query = Query.CollectionOne
-    } 
-
+    }
 
     const { data }: GraphQLFetcherResult = await fetch(
       query,
@@ -48,7 +45,8 @@ export default function getAllProductsOperation({
     )
 
     if (featured) {
-      const products = data.collection.products?.edges?.map(({ node: p }: ProductCountableEdge) => normalizeProduct(p)) ?? []
+      const products =
+        data.collection.products?.edges?.map(({ node: p }: ProductCountableEdge) => normalizeProduct(p)) ?? []
 
       return {
         products,
@@ -60,7 +58,6 @@ export default function getAllProductsOperation({
         products,
       }
     }
-
   }
 
   return getAllProducts
diff --git a/framework/saleor/api/operations/get-page.ts b/framework/saleor/api/operations/get-page.ts
index af2d5b8e6..1e6c8cf2b 100644
--- a/framework/saleor/api/operations/get-page.ts
+++ b/framework/saleor/api/operations/get-page.ts
@@ -6,19 +6,16 @@ import * as Query from '../../utils/queries'
 
 export type Page = any
 
- export type GetPageResult<T extends { page?: any } = { page?: Page }> = T
-
-export default function getPageOperation({
-  commerce,
-}: OperationContext<Provider>) {
+export type GetPageResult<T extends { page?: any } = { page?: Page }> = T
 
+export default function getPageOperation({ commerce }: OperationContext<Provider>) {
   async function getPage({
     query = Query.PageOne,
     variables,
     config,
   }: {
     query?: string
-    variables: QueryPageArgs, 
+    variables: QueryPageArgs
     config?: Partial<SaleorConfig>
     preview?: boolean
   }): Promise<GetPageResult> {
@@ -26,7 +23,9 @@ export default function getPageOperation({
 
     const {
       data: { page },
-    } = await fetch(query, { variables },
+    } = await fetch(
+      query,
+      { variables },
       {
         ...(locale && {
           headers: {
diff --git a/framework/saleor/api/operations/get-product.ts b/framework/saleor/api/operations/get-product.ts
index 85fca934a..e5e8e596f 100644
--- a/framework/saleor/api/operations/get-product.ts
+++ b/framework/saleor/api/operations/get-product.ts
@@ -1,5 +1,5 @@
 import type { OperationContext } from '@commerce/api/operations'
-import { normalizeProduct, } from '../../utils'
+import { normalizeProduct } from '../../utils'
 import type { Provider, SaleorConfig } from '..'
 
 import * as Query from '../../utils/queries'
@@ -12,22 +12,22 @@ type ReturnType = {
   product: any
 }
 
-export default function getProductOperation({
-  commerce,
-}: OperationContext<Provider>) {
+export default function getProductOperation({ commerce }: OperationContext<Provider>) {
   async function getProduct({
     query = Query.ProductOneBySlug,
     variables,
     config: cfg,
   }: {
     query?: string
-    variables: Variables 
+    variables: Variables
     config?: Partial<SaleorConfig>
     preview?: boolean
   }): Promise<ReturnType> {
     const { fetch, locale } = commerce.getConfig(cfg)
 
-    const { data } = await fetch(query, { variables },
+    const { data } = await fetch(
+      query,
+      { variables },
       {
         ...(locale && {
           headers: {
diff --git a/framework/saleor/api/operations/get-site-info.ts b/framework/saleor/api/operations/get-site-info.ts
index eca0f2246..917b96ce4 100644
--- a/framework/saleor/api/operations/get-site-info.ts
+++ b/framework/saleor/api/operations/get-site-info.ts
@@ -18,7 +18,7 @@ export default function getSiteInfoOperation({ commerce }: OperationContext<Prov
     query?: string
     config?: Partial<SaleorConfig>
     preview?: boolean
-    variables?: any 
+    variables?: any
   } = {}): Promise<GetSiteInfoResult> {
     const cfg = commerce.getConfig(config)
 
diff --git a/framework/saleor/api/operations/login.ts b/framework/saleor/api/operations/login.ts
index ca680b82c..9d3a7fe9f 100644
--- a/framework/saleor/api/operations/login.ts
+++ b/framework/saleor/api/operations/login.ts
@@ -1,28 +1,26 @@
 import type { ServerResponse } from 'http'
 import type { OperationContext } from '@commerce/api/operations'
 import type { Provider, SaleorConfig } from '..'
-import {
-  throwUserErrors,
-} from '../../utils'
+import { throwUserErrors } from '../../utils'
 
 import * as Mutation from '../../utils/mutations'
 
-export default function loginOperation({
-  commerce,
-}: OperationContext<Provider>) {
+export default function loginOperation({ commerce }: OperationContext<Provider>) {
   async function login({
     query = Mutation.SessionCreate,
     variables,
     config,
   }: {
     query?: string
-    variables: any 
+    variables: any
     res: ServerResponse
     config?: SaleorConfig
   }): Promise<any> {
     config = commerce.getConfig(config)
 
-    const { data: { customerAccessTokenCreate } } = await config.fetch(query, { variables })
+    const {
+      data: { customerAccessTokenCreate },
+    } = await config.fetch(query, { variables })
 
     throwUserErrors(customerAccessTokenCreate?.customerUserErrors)
 
diff --git a/framework/saleor/auth/use-signup.tsx b/framework/saleor/auth/use-signup.tsx
index d9e91b468..06df516a5 100644
--- a/framework/saleor/auth/use-signup.tsx
+++ b/framework/saleor/auth/use-signup.tsx
@@ -29,7 +29,7 @@ export const handler: MutationHook<SignupHook> = {
           email,
           password,
           redirectUrl: 'https://localhost.com',
-          channel: 'default-channel'
+          channel: 'default-channel',
         },
       },
     })
diff --git a/framework/saleor/cart/use-remove-item.tsx b/framework/saleor/cart/use-remove-item.tsx
index 81f9c122f..17be31e0c 100644
--- a/framework/saleor/cart/use-remove-item.tsx
+++ b/framework/saleor/cart/use-remove-item.tsx
@@ -21,9 +21,9 @@ export const handler = {
     })
     return checkoutToCart(data.checkoutLineDelete)
   },
-  useHook: ({ fetch }: MutationHookContext<RemoveItemHook>) => <
-    T extends LineItem | undefined = undefined
-  > () => {
+  useHook:
+    ({ fetch }: MutationHookContext<RemoveItemHook>) =>
+    <T extends LineItem | undefined = undefined>() => {
       const { mutate } = useCart()
 
       return useCallback(
@@ -34,6 +34,6 @@ export const handler = {
           return data
         },
         [fetch, mutate]
-      );
+      )
     },
 }
diff --git a/framework/saleor/cart/use-update-item.tsx b/framework/saleor/cart/use-update-item.tsx
index 361ae5cdf..bd596132d 100644
--- a/framework/saleor/cart/use-update-item.tsx
+++ b/framework/saleor/cart/use-update-item.tsx
@@ -23,11 +23,7 @@ export default useUpdateItem as UseUpdateItem<typeof handler>
 
 export const handler = {
   fetchOptions: { query: mutation.CheckoutLineUpdate },
-  async fetcher({ 
-    input: { itemId, item }, 
-    options, 
-    fetch 
-  }: HookFetcherContext<UpdateItemHook>) {
+  async fetcher({ input: { itemId, item }, options, fetch }: HookFetcherContext<UpdateItemHook>) {
     if (Number.isInteger(item.quantity)) {
       // Also allow the update hook to remove an item if the quantity is lower than 1
       if (item.quantity! < 1) {
@@ -59,7 +55,8 @@ export const handler = {
 
     return checkoutToCart(checkoutLinesUpdate)
   },
-  useHook: ({ fetch }: MutationHookContext<UpdateItemHook>) => 
+  useHook:
+    ({ fetch }: MutationHookContext<UpdateItemHook>) =>
     <T extends LineItem | undefined = undefined>(
       ctx: {
         item?: T
diff --git a/framework/saleor/utils/checkout-to-cart.ts b/framework/saleor/utils/checkout-to-cart.ts
index 638ca815e..0bfcf6ed9 100644
--- a/framework/saleor/utils/checkout-to-cart.ts
+++ b/framework/saleor/utils/checkout-to-cart.ts
@@ -1,7 +1,15 @@
 import { Cart } from '../types'
 import { CommerceError } from '@commerce/utils/errors'
 
-import { CheckoutLinesAdd, CheckoutLinesUpdate, CheckoutCreate, CheckoutError, Checkout, Maybe, CheckoutLineDelete } from '../schema'
+import {
+  CheckoutLinesAdd,
+  CheckoutLinesUpdate,
+  CheckoutCreate,
+  CheckoutError,
+  Checkout,
+  Maybe,
+  CheckoutLineDelete,
+} from '../schema'
 
 import { normalizeCart } from './normalize'
 import throwUserErrors from './throw-user-errors'
@@ -11,7 +19,12 @@ export type CheckoutQuery = {
   errors?: Array<CheckoutError>
 }
 
-export type CheckoutPayload = CheckoutLinesAdd | CheckoutLinesUpdate | CheckoutCreate | CheckoutQuery | CheckoutLineDelete
+export type CheckoutPayload =
+  | CheckoutLinesAdd
+  | CheckoutLinesUpdate
+  | CheckoutCreate
+  | CheckoutQuery
+  | CheckoutLineDelete
 
 const checkoutToCart = (checkoutPayload?: Maybe<CheckoutPayload>): Cart => {
   if (!checkoutPayload) {
diff --git a/framework/shopify/api/operations/get-all-pages.ts b/framework/shopify/api/operations/get-all-pages.ts
index 58bc6a94b..38285ccca 100644
--- a/framework/shopify/api/operations/get-all-pages.ts
+++ b/framework/shopify/api/operations/get-all-pages.ts
@@ -38,9 +38,11 @@ export default function getAllPagesOperation({
     preview?: boolean
     query?: string
   } = {}): Promise<T['data']> {
-    const { fetch, locale, locales = ['en-US', 'es'] } = commerce.getConfig(
-      config
-    )
+    const {
+      fetch,
+      locale,
+      locales = ['en-US', 'es'],
+    } = commerce.getConfig(config)
 
     const { data } = await fetch<GetAllPagesQuery, GetAllPagesQueryVariables>(
       query,
diff --git a/framework/shopify/auth/use-login.tsx b/framework/shopify/auth/use-login.tsx
index e1de89c99..98b8cdd56 100644
--- a/framework/shopify/auth/use-login.tsx
+++ b/framework/shopify/auth/use-login.tsx
@@ -21,8 +21,7 @@ export const handler: MutationHook<LoginHook> = {
   async fetcher({ input: { email, password }, options, fetch }) {
     if (!(email && password)) {
       throw new CommerceError({
-        message:
-          'An email and password are required to login',
+        message: 'An email and password are required to login',
       })
     }
 
@@ -47,16 +46,18 @@ export const handler: MutationHook<LoginHook> = {
 
     return null
   },
-  useHook: ({ fetch }) => () => {
-    const { revalidate } = useCustomer()
+  useHook:
+    ({ fetch }) =>
+    () => {
+      const { revalidate } = useCustomer()
 
-    return useCallback(
-      async function login(input) {
-        const data = await fetch({ input })
-        await revalidate()
-        return data
-      },
-      [fetch, revalidate]
-    )
-  },
+      return useCallback(
+        async function login(input) {
+          const data = await fetch({ input })
+          await revalidate()
+          return data
+        },
+        [fetch, revalidate]
+      )
+    },
 }
diff --git a/framework/shopify/auth/use-logout.tsx b/framework/shopify/auth/use-logout.tsx
index 30074b8d5..fdba8df84 100644
--- a/framework/shopify/auth/use-logout.tsx
+++ b/framework/shopify/auth/use-logout.tsx
@@ -22,16 +22,18 @@ export const handler: MutationHook<LogoutHook> = {
     setCustomerToken(null)
     return null
   },
-  useHook: ({ fetch }) => () => {
-    const { mutate } = useCustomer()
+  useHook:
+    ({ fetch }) =>
+    () => {
+      const { mutate } = useCustomer()
 
-    return useCallback(
-      async function logout() {
-        const data = await fetch()
-        await mutate(null, false)
-        return data
-      },
-      [fetch, mutate]
-    )
-  },
+      return useCallback(
+        async function logout() {
+          const data = await fetch()
+          await mutate(null, false)
+          return data
+        },
+        [fetch, mutate]
+      )
+    },
 }
diff --git a/framework/shopify/auth/use-signup.tsx b/framework/shopify/auth/use-signup.tsx
index 29557e960..0a55c17d4 100644
--- a/framework/shopify/auth/use-signup.tsx
+++ b/framework/shopify/auth/use-signup.tsx
@@ -50,16 +50,18 @@ export const handler: MutationHook<SignupHook> = {
 
     return null
   },
-  useHook: ({ fetch }) => () => {
-    const { revalidate } = useCustomer()
+  useHook:
+    ({ fetch }) =>
+    () => {
+      const { revalidate } = useCustomer()
 
-    return useCallback(
-      async function signup(input) {
-        const data = await fetch({ input })
-        await revalidate()
-        return data
-      },
-      [fetch, revalidate]
-    )
-  },
+      return useCallback(
+        async function signup(input) {
+          const data = await fetch({ input })
+          await revalidate()
+          return data
+        },
+        [fetch, revalidate]
+      )
+    },
 }
diff --git a/framework/shopify/cart/use-remove-item.tsx b/framework/shopify/cart/use-remove-item.tsx
index bf9fb2d95..5e193358b 100644
--- a/framework/shopify/cart/use-remove-item.tsx
+++ b/framework/shopify/cart/use-remove-item.tsx
@@ -41,27 +41,25 @@ export const handler = {
     })
     return checkoutToCart(data.checkoutLineItemsRemove)
   },
-  useHook: ({ fetch }: MutationHookContext<RemoveItemHook>) => <
-    T extends LineItem | undefined = undefined
-  >(
-    ctx: { item?: T } = {}
-  ) => {
-    const { item } = ctx
-    const { mutate } = useCart()
-    const removeItem: RemoveItemFn<LineItem> = async (input) => {
-      const itemId = input?.id ?? item?.id
+  useHook:
+    ({ fetch }: MutationHookContext<RemoveItemHook>) =>
+    <T extends LineItem | undefined = undefined>(ctx: { item?: T } = {}) => {
+      const { item } = ctx
+      const { mutate } = useCart()
+      const removeItem: RemoveItemFn<LineItem> = async (input) => {
+        const itemId = input?.id ?? item?.id
 
-      if (!itemId) {
-        throw new ValidationError({
-          message: 'Invalid input used for this operation',
-        })
+        if (!itemId) {
+          throw new ValidationError({
+            message: 'Invalid input used for this operation',
+          })
+        }
+
+        const data = await fetch({ input: { itemId } })
+        await mutate(data, false)
+        return data
       }
 
-      const data = await fetch({ input: { itemId } })
-      await mutate(data, false)
-      return data
-    }
-
-    return useCallback(removeItem as RemoveItemFn<T>, [fetch, mutate])
-  },
+      return useCallback(removeItem as RemoveItemFn<T>, [fetch, mutate])
+    },
 }
diff --git a/framework/shopify/cart/use-update-item.tsx b/framework/shopify/cart/use-update-item.tsx
index 3f1cf4315..83d0a220a 100644
--- a/framework/shopify/cart/use-update-item.tsx
+++ b/framework/shopify/cart/use-update-item.tsx
@@ -64,42 +64,42 @@ export const handler = {
 
     return checkoutToCart(checkoutLineItemsUpdate)
   },
-  useHook: ({ fetch }: MutationHookContext<UpdateItemHook>) => <
-    T extends LineItem | undefined = undefined
-  >(
-    ctx: {
-      item?: T
-      wait?: number
-    } = {}
-  ) => {
-    const { item } = ctx
-    const { mutate } = useCart() as any
+  useHook:
+    ({ fetch }: MutationHookContext<UpdateItemHook>) =>
+    <T extends LineItem | undefined = undefined>(
+      ctx: {
+        item?: T
+        wait?: number
+      } = {}
+    ) => {
+      const { item } = ctx
+      const { mutate } = useCart() as any
 
-    return useCallback(
-      debounce(async (input: UpdateItemActionInput<T>) => {
-        const itemId = input.id ?? item?.id
-        const productId = input.productId ?? item?.productId
-        const variantId = input.productId ?? item?.variantId
-        if (!itemId || !productId || !variantId) {
-          throw new ValidationError({
-            message: 'Invalid input used for this operation',
-          })
-        }
+      return useCallback(
+        debounce(async (input: UpdateItemActionInput<T>) => {
+          const itemId = input.id ?? item?.id
+          const productId = input.productId ?? item?.productId
+          const variantId = input.productId ?? item?.variantId
+          if (!itemId || !productId || !variantId) {
+            throw new ValidationError({
+              message: 'Invalid input used for this operation',
+            })
+          }
 
-        const data = await fetch({
-          input: {
-            item: {
-              productId,
-              variantId,
-              quantity: input.quantity,
+          const data = await fetch({
+            input: {
+              item: {
+                productId,
+                variantId,
+                quantity: input.quantity,
+              },
+              itemId,
             },
-            itemId,
-          },
-        })
-        await mutate(data, false)
-        return data
-      }, ctx.wait ?? 500),
-      [fetch, mutate]
-    )
-  },
+          })
+          await mutate(data, false)
+          return data
+        }, ctx.wait ?? 500),
+        [fetch, mutate]
+      )
+    },
 }
diff --git a/framework/shopify/customer/use-customer.tsx b/framework/shopify/customer/use-customer.tsx
index be097fe80..5c470e7de 100644
--- a/framework/shopify/customer/use-customer.tsx
+++ b/framework/shopify/customer/use-customer.tsx
@@ -21,12 +21,14 @@ export const handler: SWRHook<CustomerHook> = {
     }
     return null
   },
-  useHook: ({ useData }) => (input) => {
-    return useData({
-      swrOptions: {
-        revalidateOnFocus: false,
-        ...input?.swrOptions,
-      },
-    })
-  },
+  useHook:
+    ({ useData }) =>
+    (input) => {
+      return useData({
+        swrOptions: {
+          revalidateOnFocus: false,
+          ...input?.swrOptions,
+        },
+      })
+    },
 }
diff --git a/framework/shopify/product/use-search.tsx b/framework/shopify/product/use-search.tsx
index 72dc8bb65..b975c03fe 100644
--- a/framework/shopify/product/use-search.tsx
+++ b/framework/shopify/product/use-search.tsx
@@ -71,19 +71,21 @@ export const handler: SWRHook<SearchProductsHook> = {
       found: !!products?.length,
     }
   },
-  useHook: ({ useData }) => (input = {}) => {
-    return useData({
-      input: [
-        ['search', input.search],
-        ['categoryId', input.categoryId],
-        ['brandId', input.brandId],
-        ['sort', input.sort],
-        ['locale', input.locale],
-      ],
-      swrOptions: {
-        revalidateOnFocus: false,
-        ...input.swrOptions,
-      },
-    })
-  },
+  useHook:
+    ({ useData }) =>
+    (input = {}) => {
+      return useData({
+        input: [
+          ['search', input.search],
+          ['categoryId', input.categoryId],
+          ['brandId', input.brandId],
+          ['sort', input.sort],
+          ['locale', input.locale],
+        ],
+        swrOptions: {
+          revalidateOnFocus: false,
+          ...input.swrOptions,
+        },
+      })
+    },
 }
diff --git a/framework/swell/api/operations/get-all-pages.ts b/framework/swell/api/operations/get-all-pages.ts
index 6abaa155c..e157c0138 100644
--- a/framework/swell/api/operations/get-all-pages.ts
+++ b/framework/swell/api/operations/get-all-pages.ts
@@ -2,9 +2,8 @@ import { Provider, SwellConfig } from '..'
 import type { OperationContext } from '@commerce/api/operations'
 import type { Page } from '../../types/page'
 
-export type GetAllPagesResult<
-  T extends { pages: any[] } = { pages: Page[] }
-> = T
+export type GetAllPagesResult<T extends { pages: any[] } = { pages: Page[] }> =
+  T
 
 export default function getAllPagesOperation({
   commerce,
diff --git a/framework/swell/auth/use-login.tsx b/framework/swell/auth/use-login.tsx
index 587163d97..5a34975fa 100644
--- a/framework/swell/auth/use-login.tsx
+++ b/framework/swell/auth/use-login.tsx
@@ -59,16 +59,18 @@ export const handler: MutationHook<LoginHook> = {
 
     return null
   },
-  useHook: ({ fetch }) => () => {
-    const { revalidate } = useCustomer()
+  useHook:
+    ({ fetch }) =>
+    () => {
+      const { revalidate } = useCustomer()
 
-    return useCallback(
-      async function login(input) {
-        const data = await fetch({ input })
-        await revalidate()
-        return data
-      },
-      [fetch, revalidate]
-    )
-  },
+      return useCallback(
+        async function login(input) {
+          const data = await fetch({ input })
+          await revalidate()
+          return data
+        },
+        [fetch, revalidate]
+      )
+    },
 }
diff --git a/framework/swell/auth/use-logout.tsx b/framework/swell/auth/use-logout.tsx
index 7dc7411ec..0e08ce9c6 100644
--- a/framework/swell/auth/use-logout.tsx
+++ b/framework/swell/auth/use-logout.tsx
@@ -22,16 +22,18 @@ export const handler: MutationHook<LogoutHook> = {
     setCustomerToken(null)
     return null
   },
-  useHook: ({ fetch }) => () => {
-    const { mutate } = useCustomer()
+  useHook:
+    ({ fetch }) =>
+    () => {
+      const { mutate } = useCustomer()
 
-    return useCallback(
-      async function logout() {
-        const data = await fetch()
-        await mutate(null, false)
-        return data
-      },
-      [fetch, mutate]
-    )
-  },
+      return useCallback(
+        async function logout() {
+          const data = await fetch()
+          await mutate(null, false)
+          return data
+        },
+        [fetch, mutate]
+      )
+    },
 }
diff --git a/framework/swell/auth/use-signup.tsx b/framework/swell/auth/use-signup.tsx
index 674b9861f..246285ece 100644
--- a/framework/swell/auth/use-signup.tsx
+++ b/framework/swell/auth/use-signup.tsx
@@ -44,16 +44,18 @@ export const handler: MutationHook<SignupHook> = {
     } catch (error) {}
     return data
   },
-  useHook: ({ fetch }) => () => {
-    const { revalidate } = useCustomer()
+  useHook:
+    ({ fetch }) =>
+    () => {
+      const { revalidate } = useCustomer()
 
-    return useCallback(
-      async function signup(input) {
-        const data = await fetch({ input })
-        await revalidate()
-        return data
-      },
-      [fetch, revalidate]
-    )
-  },
+      return useCallback(
+        async function signup(input) {
+          const data = await fetch({ input })
+          await revalidate()
+          return data
+        },
+        [fetch, revalidate]
+      )
+    },
 }
diff --git a/framework/swell/cart/use-add-item.tsx b/framework/swell/cart/use-add-item.tsx
index e324a44d9..dac4fb9bb 100644
--- a/framework/swell/cart/use-add-item.tsx
+++ b/framework/swell/cart/use-add-item.tsx
@@ -44,16 +44,18 @@ export const handler: MutationHook<AddItemHook> = {
 
     return checkoutToCart(response) as any
   },
-  useHook: ({ fetch }) => () => {
-    const { mutate } = useCart()
+  useHook:
+    ({ fetch }) =>
+    () => {
+      const { mutate } = useCart()
 
-    return useCallback(
-      async function addItem(input) {
-        const data = await fetch({ input })
-        await mutate(data, false)
-        return data
-      },
-      [fetch, mutate]
-    )
-  },
+      return useCallback(
+        async function addItem(input) {
+          const data = await fetch({ input })
+          await mutate(data, false)
+          return data
+        },
+        [fetch, mutate]
+      )
+    },
 }
diff --git a/framework/swell/cart/use-cart.tsx b/framework/swell/cart/use-cart.tsx
index 885f889f5..7dc48b052 100644
--- a/framework/swell/cart/use-cart.tsx
+++ b/framework/swell/cart/use-cart.tsx
@@ -17,21 +17,23 @@ export const handler: SWRHook<GetCartHook> = {
 
     return cart ? normalizeCart(cart) : null
   },
-  useHook: ({ useData }) => (input) => {
-    const response = useData({
-      swrOptions: { revalidateOnFocus: false, ...input?.swrOptions },
-    })
-    return useMemo(
-      () =>
-        Object.create(response, {
-          isEmpty: {
-            get() {
-              return (response.data?.lineItems.length ?? 0) <= 0
+  useHook:
+    ({ useData }) =>
+    (input) => {
+      const response = useData({
+        swrOptions: { revalidateOnFocus: false, ...input?.swrOptions },
+      })
+      return useMemo(
+        () =>
+          Object.create(response, {
+            isEmpty: {
+              get() {
+                return (response.data?.lineItems.length ?? 0) <= 0
+              },
+              enumerable: true,
             },
-            enumerable: true,
-          },
-        }),
-      [response]
-    )
-  },
+          }),
+        [response]
+      )
+    },
 }
diff --git a/framework/swell/cart/use-remove-item.tsx b/framework/swell/cart/use-remove-item.tsx
index 7ef3af7cd..fe1ee24ca 100644
--- a/framework/swell/cart/use-remove-item.tsx
+++ b/framework/swell/cart/use-remove-item.tsx
@@ -33,17 +33,19 @@ export const handler = {
 
     return checkoutToCart(response)
   },
-  useHook: ({ fetch }: MutationHookContext<RemoveItemHook>) => () => {
-    const { mutate } = useCart()
+  useHook:
+    ({ fetch }: MutationHookContext<RemoveItemHook>) =>
+    () => {
+      const { mutate } = useCart()
 
-    return useCallback(
-      async function removeItem(input) {
-        const data = await fetch({ input: { itemId: input.id } })
-        await mutate(data, false)
+      return useCallback(
+        async function removeItem(input) {
+          const data = await fetch({ input: { itemId: input.id } })
+          await mutate(data, false)
 
-        return data
-      },
-      [fetch, mutate]
-    )
-  },
+          return data
+        },
+        [fetch, mutate]
+      )
+    },
 }
diff --git a/framework/swell/cart/use-update-item.tsx b/framework/swell/cart/use-update-item.tsx
index 631a394f6..5d705c5e5 100644
--- a/framework/swell/cart/use-update-item.tsx
+++ b/framework/swell/cart/use-update-item.tsx
@@ -57,43 +57,43 @@ export const handler = {
 
     return checkoutToCart(response)
   },
-  useHook: ({ fetch }: MutationHookContext<UpdateItemHook>) => <
-    T extends LineItem | undefined = undefined
-  >(
-    ctx: {
-      item?: T
-      wait?: number
-    } = {}
-  ) => {
-    const { item } = ctx
-    const { mutate, data: cartData } = useCart() as any
+  useHook:
+    ({ fetch }: MutationHookContext<UpdateItemHook>) =>
+    <T extends LineItem | undefined = undefined>(
+      ctx: {
+        item?: T
+        wait?: number
+      } = {}
+    ) => {
+      const { item } = ctx
+      const { mutate, data: cartData } = useCart() as any
 
-    return useCallback(
-      debounce(async (input: UpdateItemActionInput) => {
-        const firstLineItem = cartData.lineItems[0]
-        const itemId = item?.id || firstLineItem.id
-        const productId = item?.productId || firstLineItem.productId
-        const variantId = item?.variant.id || firstLineItem.variant.id
-        if (!itemId || !productId) {
-          throw new ValidationError({
-            message: 'Invalid input used for this operation',
-          })
-        }
+      return useCallback(
+        debounce(async (input: UpdateItemActionInput) => {
+          const firstLineItem = cartData.lineItems[0]
+          const itemId = item?.id || firstLineItem.id
+          const productId = item?.productId || firstLineItem.productId
+          const variantId = item?.variant.id || firstLineItem.variant.id
+          if (!itemId || !productId) {
+            throw new ValidationError({
+              message: 'Invalid input used for this operation',
+            })
+          }
 
-        const data = await fetch({
-          input: {
-            item: {
-              productId,
-              variantId,
-              quantity: input.quantity,
+          const data = await fetch({
+            input: {
+              item: {
+                productId,
+                variantId,
+                quantity: input.quantity,
+              },
+              itemId,
             },
-            itemId,
-          },
-        })
-        await mutate(data, false)
-        return data
-      }, ctx.wait ?? 500),
-      [fetch, mutate]
-    )
-  },
+          })
+          await mutate(data, false)
+          return data
+        }, ctx.wait ?? 500),
+        [fetch, mutate]
+      )
+    },
 }
diff --git a/framework/swell/customer/use-customer.tsx b/framework/swell/customer/use-customer.tsx
index 50e85d3f6..3371db89c 100644
--- a/framework/swell/customer/use-customer.tsx
+++ b/framework/swell/customer/use-customer.tsx
@@ -16,12 +16,14 @@ export const handler: SWRHook<CustomerHook> = {
     })
     return data ? normalizeCustomer(data) : null
   },
-  useHook: ({ useData }) => (input) => {
-    return useData({
-      swrOptions: {
-        revalidateOnFocus: false,
-        ...input?.swrOptions,
-      },
-    })
-  },
+  useHook:
+    ({ useData }) =>
+    (input) => {
+      return useData({
+        swrOptions: {
+          revalidateOnFocus: false,
+          ...input?.swrOptions,
+        },
+      })
+    },
 }
diff --git a/framework/swell/product/use-search.tsx b/framework/swell/product/use-search.tsx
index bdcca3ff2..62f813368 100644
--- a/framework/swell/product/use-search.tsx
+++ b/framework/swell/product/use-search.tsx
@@ -42,18 +42,20 @@ export const handler: SWRHook<SearchProductsHook> = {
       found,
     }
   },
-  useHook: ({ useData }) => (input = {}) => {
-    return useData({
-      input: [
-        ['search', input.search],
-        ['categoryId', input.categoryId],
-        ['brandId', input.brandId],
-        ['sort', input.sort],
-      ],
-      swrOptions: {
-        revalidateOnFocus: false,
-        ...input.swrOptions,
-      },
-    })
-  },
+  useHook:
+    ({ useData }) =>
+    (input = {}) => {
+      return useData({
+        input: [
+          ['search', input.search],
+          ['categoryId', input.categoryId],
+          ['brandId', input.brandId],
+          ['sort', input.sort],
+        ],
+        swrOptions: {
+          revalidateOnFocus: false,
+          ...input.swrOptions,
+        },
+      })
+    },
 }
diff --git a/framework/vendure/api/operations/get-all-pages.ts b/framework/vendure/api/operations/get-all-pages.ts
index 43170cda8..f76b7390f 100644
--- a/framework/vendure/api/operations/get-all-pages.ts
+++ b/framework/vendure/api/operations/get-all-pages.ts
@@ -4,9 +4,8 @@ import { Provider } from '../../../bigcommerce/api'
 
 export type Page = any
 
-export type GetAllPagesResult<
-  T extends { pages: any[] } = { pages: Page[] }
-> = T
+export type GetAllPagesResult<T extends { pages: any[] } = { pages: Page[] }> =
+  T
 
 export default function getAllPagesOperation({
   commerce,
diff --git a/framework/vendure/auth/use-login.tsx b/framework/vendure/auth/use-login.tsx
index f10e38d0f..a9b63e895 100644
--- a/framework/vendure/auth/use-login.tsx
+++ b/framework/vendure/auth/use-login.tsx
@@ -36,16 +36,18 @@ export const handler: MutationHook<LoginHook> = {
 
     return null
   },
-  useHook: ({ fetch }) => () => {
-    const { revalidate } = useCustomer()
+  useHook:
+    ({ fetch }) =>
+    () => {
+      const { revalidate } = useCustomer()
 
-    return useCallback(
-      async function login(input) {
-        const data = await fetch({ input })
-        await revalidate()
-        return data
-      },
-      [fetch, revalidate]
-    )
-  },
+      return useCallback(
+        async function login(input) {
+          const data = await fetch({ input })
+          await revalidate()
+          return data
+        },
+        [fetch, revalidate]
+      )
+    },
 }
diff --git a/framework/vendure/auth/use-signup.tsx b/framework/vendure/auth/use-signup.tsx
index 864b1a18a..4018baed6 100644
--- a/framework/vendure/auth/use-signup.tsx
+++ b/framework/vendure/auth/use-signup.tsx
@@ -54,16 +54,18 @@ export const handler: MutationHook<SignupHook> = {
 
     return null
   },
-  useHook: ({ fetch }) => () => {
-    const { revalidate } = useCustomer()
+  useHook:
+    ({ fetch }) =>
+    () => {
+      const { revalidate } = useCustomer()
 
-    return useCallback(
-      async function signup(input) {
-        const data = await fetch({ input })
-        await revalidate()
-        return data
-      },
-      [fetch, revalidate]
-    )
-  },
+      return useCallback(
+        async function signup(input) {
+          const data = await fetch({ input })
+          await revalidate()
+          return data
+        },
+        [fetch, revalidate]
+      )
+    },
 }
diff --git a/framework/vendure/cart/use-add-item.tsx b/framework/vendure/cart/use-add-item.tsx
index 88bff40e4..7c131eaea 100644
--- a/framework/vendure/cart/use-add-item.tsx
+++ b/framework/vendure/cart/use-add-item.tsx
@@ -37,16 +37,18 @@ export const handler: MutationHook<AddItemHook> = {
     }
     throw new CommerceError(addItemToOrder)
   },
-  useHook: ({ fetch }) => () => {
-    const { mutate } = useCart()
+  useHook:
+    ({ fetch }) =>
+    () => {
+      const { mutate } = useCart()
 
-    return useCallback(
-      async function addItem(input) {
-        const data = await fetch({ input })
-        await mutate(data, false)
-        return data
-      },
-      [fetch, mutate]
-    )
-  },
+      return useCallback(
+        async function addItem(input) {
+          const data = await fetch({ input })
+          await mutate(data, false)
+          return data
+        },
+        [fetch, mutate]
+      )
+    },
 }
diff --git a/framework/vendure/cart/use-cart.tsx b/framework/vendure/cart/use-cart.tsx
index 400df0c8c..de42036b8 100644
--- a/framework/vendure/cart/use-cart.tsx
+++ b/framework/vendure/cart/use-cart.tsx
@@ -23,22 +23,24 @@ export const handler: SWRHook<GetCartHook> = {
     const { activeOrder } = await fetch<ActiveOrderQuery>(options)
     return activeOrder ? normalizeCart(activeOrder) : null
   },
-  useHook: ({ useData }) => (input) => {
-    const response = useData({
-      swrOptions: { revalidateOnFocus: false, ...input?.swrOptions },
-    })
+  useHook:
+    ({ useData }) =>
+    (input) => {
+      const response = useData({
+        swrOptions: { revalidateOnFocus: false, ...input?.swrOptions },
+      })
 
-    return useMemo(
-      () =>
-        Object.create(response, {
-          isEmpty: {
-            get() {
-              return (response.data?.lineItems.length ?? 0) <= 0
+      return useMemo(
+        () =>
+          Object.create(response, {
+            isEmpty: {
+              get() {
+                return (response.data?.lineItems.length ?? 0) <= 0
+              },
+              enumerable: true,
             },
-            enumerable: true,
-          },
-        }),
-      [response]
-    )
-  },
+          }),
+        [response]
+      )
+    },
 }
diff --git a/framework/vendure/cart/use-remove-item.tsx b/framework/vendure/cart/use-remove-item.tsx
index 39855e1ac..dde8e18b3 100644
--- a/framework/vendure/cart/use-remove-item.tsx
+++ b/framework/vendure/cart/use-remove-item.tsx
@@ -37,16 +37,18 @@ export const handler: MutationHook<RemoveItemHook> = {
     }
     throw new CommerceError(removeOrderLine)
   },
-  useHook: ({ fetch }) => () => {
-    const { mutate } = useCart()
+  useHook:
+    ({ fetch }) =>
+    () => {
+      const { mutate } = useCart()
 
-    return useCallback(
-      async function removeItem(input) {
-        const data = await fetch({ input: { itemId: input.id } })
-        await mutate(data, false)
-        return data
-      },
-      [fetch, mutate]
-    )
-  },
+      return useCallback(
+        async function removeItem(input) {
+          const data = await fetch({ input: { itemId: input.id } })
+          await mutate(data, false)
+          return data
+        },
+        [fetch, mutate]
+      )
+    },
 }
diff --git a/framework/vendure/cart/use-update-item.tsx b/framework/vendure/cart/use-update-item.tsx
index d04de944a..029966c5a 100644
--- a/framework/vendure/cart/use-update-item.tsx
+++ b/framework/vendure/cart/use-update-item.tsx
@@ -42,39 +42,41 @@ export const handler = {
     }
     throw new CommerceError(adjustOrderLine)
   },
-  useHook: ({ fetch }: MutationHookContext<UpdateItemHook>) => (
-    ctx: {
-      item?: LineItem
-      wait?: number
-    } = {}
-  ) => {
-    const { item } = ctx
-    const { mutate } = useCart()
+  useHook:
+    ({ fetch }: MutationHookContext<UpdateItemHook>) =>
+    (
+      ctx: {
+        item?: LineItem
+        wait?: number
+      } = {}
+    ) => {
+      const { item } = ctx
+      const { mutate } = useCart()
 
-    return useCallback(
-      async function addItem(input: UpdateItemActionInput) {
-        const itemId = item?.id
-        const productId = input.productId ?? item?.productId
-        const variantId = input.productId ?? item?.variantId
-        if (!itemId || !productId || !variantId) {
-          throw new ValidationError({
-            message: 'Invalid input used for this operation',
-          })
-        }
-        const data = await fetch({
-          input: {
-            item: {
-              productId,
-              variantId,
-              quantity: input.quantity,
+      return useCallback(
+        async function addItem(input: UpdateItemActionInput) {
+          const itemId = item?.id
+          const productId = input.productId ?? item?.productId
+          const variantId = input.productId ?? item?.variantId
+          if (!itemId || !productId || !variantId) {
+            throw new ValidationError({
+              message: 'Invalid input used for this operation',
+            })
+          }
+          const data = await fetch({
+            input: {
+              item: {
+                productId,
+                variantId,
+                quantity: input.quantity,
+              },
+              itemId,
             },
-            itemId,
-          },
-        })
-        await mutate(data, false)
-        return data
-      },
-      [fetch, mutate]
-    )
-  },
+          })
+          await mutate(data, false)
+          return data
+        },
+        [fetch, mutate]
+      )
+    },
 }
diff --git a/framework/vendure/customer/use-customer.tsx b/framework/vendure/customer/use-customer.tsx
index 1d5a53d48..e9047485b 100644
--- a/framework/vendure/customer/use-customer.tsx
+++ b/framework/vendure/customer/use-customer.tsx
@@ -22,12 +22,14 @@ export const handler: SWRHook<CustomerHook> = {
         } as any)
       : null
   },
-  useHook: ({ useData }) => (input) => {
-    return useData({
-      swrOptions: {
-        revalidateOnFocus: false,
-        ...input?.swrOptions,
-      },
-    })
-  },
+  useHook:
+    ({ useData }) =>
+    (input) => {
+      return useData({
+        swrOptions: {
+          revalidateOnFocus: false,
+          ...input?.swrOptions,
+        },
+      })
+    },
 }
diff --git a/framework/vendure/fetcher.ts b/framework/vendure/fetcher.ts
index 26e1eec28..48b041801 100644
--- a/framework/vendure/fetcher.ts
+++ b/framework/vendure/fetcher.ts
@@ -48,6 +48,6 @@ export const fetcher: Fetcher = async ({
     }
     return data
   }
-  
+
   throw await getError(res)
 }
diff --git a/framework/vendure/product/use-search.tsx b/framework/vendure/product/use-search.tsx
index e34db2ac2..827b23623 100644
--- a/framework/vendure/product/use-search.tsx
+++ b/framework/vendure/product/use-search.tsx
@@ -45,18 +45,20 @@ export const handler: SWRHook<SearchProductsHook> = {
       products: search.items.map((item) => normalizeSearchResult(item)) ?? [],
     }
   },
-  useHook: ({ useData }) => (input = {}) => {
-    return useData({
-      input: [
-        ['search', input.search],
-        ['categoryId', input.categoryId],
-        ['brandId', input.brandId],
-        ['sort', input.sort],
-      ],
-      swrOptions: {
-        revalidateOnFocus: false,
-        ...input.swrOptions,
-      },
-    })
-  },
+  useHook:
+    ({ useData }) =>
+    (input = {}) => {
+      return useData({
+        input: [
+          ['search', input.search],
+          ['categoryId', input.categoryId],
+          ['brandId', input.brandId],
+          ['sort', input.sort],
+        ],
+        swrOptions: {
+          revalidateOnFocus: false,
+          ...input.swrOptions,
+        },
+      })
+    },
 }