diff --git a/framework/shopify/api/operations/get-all-pages.ts b/framework/shopify/api/operations/get-all-pages.ts
index 38285ccca..3e94264e7 100644
--- a/framework/shopify/api/operations/get-all-pages.ts
+++ b/framework/shopify/api/operations/get-all-pages.ts
@@ -6,7 +6,7 @@ import {
   GetAllPagesQuery,
   GetAllPagesQueryVariables,
   PageEdge,
-} from '../../schema'
+} from '../../../schema'
 import { normalizePages } from '../../utils'
 import type { ShopifyConfig, Provider } from '..'
 import type { GetAllPagesOperation, Page } from '../../types/page'
diff --git a/framework/shopify/api/operations/get-all-product-paths.ts b/framework/shopify/api/operations/get-all-product-paths.ts
index c84f8c90a..69182be43 100644
--- a/framework/shopify/api/operations/get-all-product-paths.ts
+++ b/framework/shopify/api/operations/get-all-product-paths.ts
@@ -7,7 +7,7 @@ import {
   GetAllProductPathsQuery,
   GetAllProductPathsQueryVariables,
   ProductEdge,
-} from '../../schema'
+} from '../../../schema'
 import type { ShopifyConfig, Provider } from '..'
 import { getAllProductsQuery } from '../../utils'
 
diff --git a/framework/shopify/api/operations/get-all-products.ts b/framework/shopify/api/operations/get-all-products.ts
index 08d781d5c..c3e33f6db 100644
--- a/framework/shopify/api/operations/get-all-products.ts
+++ b/framework/shopify/api/operations/get-all-products.ts
@@ -7,7 +7,7 @@ import {
   GetAllProductsQuery,
   GetAllProductsQueryVariables,
   Product as ShopifyProduct,
-} from '../../schema'
+} from '../../../schema'
 import type { ShopifyConfig, Provider } from '..'
 import getAllProductsQuery from '../../utils/queries/get-all-products-query'
 import { normalizeProduct } from '../../utils'
diff --git a/framework/shopify/api/operations/get-page.ts b/framework/shopify/api/operations/get-page.ts
index 023ebeeb7..b20ab2a7d 100644
--- a/framework/shopify/api/operations/get-page.ts
+++ b/framework/shopify/api/operations/get-page.ts
@@ -8,7 +8,7 @@ import {
   GetPageQuery,
   GetPageQueryVariables,
   Page as ShopifyPage,
-} from '../../schema'
+} from '../../../schema'
 import { GetPageOperation } from '../../types/page'
 import getPageQuery from '../../utils/queries/get-page-query'
 
diff --git a/framework/shopify/api/operations/get-product.ts b/framework/shopify/api/operations/get-product.ts
index 447b5c792..69128855c 100644
--- a/framework/shopify/api/operations/get-product.ts
+++ b/framework/shopify/api/operations/get-product.ts
@@ -5,7 +5,10 @@ import type {
 import { GetProductOperation } from '../../types/product'
 import { normalizeProduct, getProductQuery } from '../../utils'
 import type { ShopifyConfig, Provider } from '..'
-import { GetProductBySlugQuery, Product as ShopifyProduct } from '../../schema'
+import {
+  GetProductBySlugQuery,
+  Product as ShopifyProduct,
+} from '../../../schema'
 
 export default function getProductOperation({
   commerce,
diff --git a/framework/shopify/api/operations/get-site-info.ts b/framework/shopify/api/operations/get-site-info.ts
index 7f51d1d5c..460eeb6fd 100644
--- a/framework/shopify/api/operations/get-site-info.ts
+++ b/framework/shopify/api/operations/get-site-info.ts
@@ -2,7 +2,7 @@ import type {
   OperationContext,
   OperationOptions,
 } from '@commerce/api/operations'
-import { GetSiteInfoQueryVariables } from '../../schema'
+import { GetSiteInfoQueryVariables } from '../../../schema'
 import type { ShopifyConfig, Provider } from '..'
 import { GetSiteInfoOperation } from '../../types/site'
 
diff --git a/framework/shopify/api/operations/login.ts b/framework/shopify/api/operations/login.ts
index 41e837a3f..411fe304d 100644
--- a/framework/shopify/api/operations/login.ts
+++ b/framework/shopify/api/operations/login.ts
@@ -7,7 +7,7 @@ import {
   setCustomerToken,
   throwUserErrors,
 } from '../../utils'
-import { CustomerAccessTokenCreateMutation } from '../../schema'
+import { CustomerAccessTokenCreateMutation } from '../../../schema'
 
 export default function loginOperation({
   commerce,
diff --git a/framework/shopify/auth/use-login.tsx b/framework/shopify/auth/use-login.tsx
index 98b8cdd56..c007ecbd2 100644
--- a/framework/shopify/auth/use-login.tsx
+++ b/framework/shopify/auth/use-login.tsx
@@ -10,7 +10,7 @@ import {
   throwUserErrors,
   customerAccessTokenCreateMutation,
 } from '../utils'
-import { Mutation, MutationCustomerAccessTokenCreateArgs } from '../schema'
+import { Mutation, MutationCustomerAccessTokenCreateArgs } from '../../schema'
 
 export default useLogin as UseLogin<typeof handler>
 
diff --git a/framework/shopify/auth/use-signup.tsx b/framework/shopify/auth/use-signup.tsx
index 0a55c17d4..d214ed252 100644
--- a/framework/shopify/auth/use-signup.tsx
+++ b/framework/shopify/auth/use-signup.tsx
@@ -4,7 +4,7 @@ import { CommerceError } from '@commerce/utils/errors'
 import useSignup, { UseSignup } from '@commerce/auth/use-signup'
 import type { SignupHook } from '../types/signup'
 import useCustomer from '../customer/use-customer'
-import { Mutation, MutationCustomerCreateArgs } from '../schema'
+import { Mutation, MutationCustomerCreateArgs } from '../../schema'
 
 import {
   handleAutomaticLogin,
diff --git a/framework/shopify/cart/use-add-item.tsx b/framework/shopify/cart/use-add-item.tsx
index 367f90e24..377de32d1 100644
--- a/framework/shopify/cart/use-add-item.tsx
+++ b/framework/shopify/cart/use-add-item.tsx
@@ -11,7 +11,7 @@ import {
   checkoutToCart,
   checkoutCreate,
 } from '../utils'
-import { Mutation, MutationCheckoutLineItemsAddArgs } from '../schema'
+import { Mutation, MutationCheckoutLineItemsAddArgs } from '../../schema'
 
 export default useAddItem as UseAddItem<typeof handler>
 
diff --git a/framework/shopify/cart/use-remove-item.tsx b/framework/shopify/cart/use-remove-item.tsx
index 5e193358b..5037c4999 100644
--- a/framework/shopify/cart/use-remove-item.tsx
+++ b/framework/shopify/cart/use-remove-item.tsx
@@ -24,7 +24,7 @@ import {
   checkoutToCart,
 } from '../utils'
 
-import { Mutation, MutationCheckoutLineItemsRemoveArgs } from '../schema'
+import { Mutation, MutationCheckoutLineItemsRemoveArgs } from '../../schema'
 
 export const handler = {
   fetchOptions: {
diff --git a/framework/shopify/cart/use-update-item.tsx b/framework/shopify/cart/use-update-item.tsx
index 83d0a220a..4e074abc4 100644
--- a/framework/shopify/cart/use-update-item.tsx
+++ b/framework/shopify/cart/use-update-item.tsx
@@ -15,7 +15,7 @@ import {
   checkoutLineItemUpdateMutation,
   checkoutToCart,
 } from '../utils'
-import { Mutation, MutationCheckoutLineItemsUpdateArgs } from '../schema'
+import { Mutation, MutationCheckoutLineItemsUpdateArgs } from '../../schema'
 
 export type UpdateItemActionInput<T = any> = T extends LineItem
   ? Partial<UpdateItemHook['actionInput']>
diff --git a/framework/shopify/customer/use-customer.tsx b/framework/shopify/customer/use-customer.tsx
index 5c470e7de..2ddc748fa 100644
--- a/framework/shopify/customer/use-customer.tsx
+++ b/framework/shopify/customer/use-customer.tsx
@@ -2,7 +2,7 @@ import useCustomer, { UseCustomer } from '@commerce/customer/use-customer'
 import type { CustomerHook } from '../types/customer'
 import { SWRHook } from '@commerce/utils/types'
 import { getCustomerQuery, getCustomerToken } from '../utils'
-import { GetCustomerQuery, GetCustomerQueryVariables } from '../schema'
+import { GetCustomerQuery, GetCustomerQueryVariables } from '../../schema'
 
 export default useCustomer as UseCustomer<typeof handler>
 
diff --git a/framework/shopify/product/use-search.tsx b/framework/shopify/product/use-search.tsx
index b975c03fe..2915ac9d2 100644
--- a/framework/shopify/product/use-search.tsx
+++ b/framework/shopify/product/use-search.tsx
@@ -7,7 +7,7 @@ import {
   GetProductsFromCollectionQueryVariables,
   Product as ShopifyProduct,
   ProductEdge,
-} from '../schema'
+} from '../../schema'
 
 import {
   getAllProductsQuery,
diff --git a/framework/shopify/types/login.ts b/framework/shopify/types/login.ts
index 964ac89e2..2ebc5157e 100644
--- a/framework/shopify/types/login.ts
+++ b/framework/shopify/types/login.ts
@@ -1,5 +1,5 @@
 import * as Core from '@commerce/types/login'
-import type { CustomerAccessTokenCreateInput } from '../schema'
+import type { CustomerAccessTokenCreateInput } from '../../schema'
 
 export * from '@commerce/types/login'
 
diff --git a/framework/shopify/utils/checkout-create.ts b/framework/shopify/utils/checkout-create.ts
index 36624ed05..dd5009561 100644
--- a/framework/shopify/utils/checkout-create.ts
+++ b/framework/shopify/utils/checkout-create.ts
@@ -12,7 +12,7 @@ import {
   CheckoutLineItemInput,
   Mutation,
   MutationCheckoutCreateArgs,
-} from '../schema'
+} from '../../schema'
 import { FetcherOptions } from '@commerce/utils/types'
 
 export const checkoutCreate = async (
diff --git a/framework/shopify/utils/checkout-to-cart.ts b/framework/shopify/utils/checkout-to-cart.ts
index 159cf0d7d..ae5d318a1 100644
--- a/framework/shopify/utils/checkout-to-cart.ts
+++ b/framework/shopify/utils/checkout-to-cart.ts
@@ -9,7 +9,7 @@ import {
   CheckoutUserError,
   Checkout,
   Maybe,
-} from '../schema'
+} from '../../schema'
 
 import { normalizeCart } from './normalize'
 import throwUserErrors from './throw-user-errors'
diff --git a/framework/shopify/utils/get-brands.ts b/framework/shopify/utils/get-brands.ts
index 3065e4ae8..eb87b519d 100644
--- a/framework/shopify/utils/get-brands.ts
+++ b/framework/shopify/utils/get-brands.ts
@@ -1,7 +1,7 @@
 import {
   GetAllProductVendorsQuery,
   GetAllProductVendorsQueryVariables,
-} from '../schema'
+} from '../../schema'
 import { ShopifyConfig } from '../api'
 import getAllProductVendors from './queries/get-all-product-vendors-query'
 
diff --git a/framework/shopify/utils/get-categories.ts b/framework/shopify/utils/get-categories.ts
index 543ee2fa1..e5ca16dad 100644
--- a/framework/shopify/utils/get-categories.ts
+++ b/framework/shopify/utils/get-categories.ts
@@ -1,6 +1,6 @@
 import type { Category } from '../types/site'
 import { ShopifyConfig } from '../api'
-import { CollectionEdge } from '../schema'
+import { CollectionEdge } from '../../schema'
 import { normalizeCategory } from './normalize'
 import getSiteCollectionsQuery from './queries/get-all-collections-query'
 
diff --git a/framework/shopify/utils/handle-account-activation.ts b/framework/shopify/utils/handle-account-activation.ts
index d11f80ba1..58f3a00c9 100644
--- a/framework/shopify/utils/handle-account-activation.ts
+++ b/framework/shopify/utils/handle-account-activation.ts
@@ -4,8 +4,8 @@ import throwUserErrors from './throw-user-errors'
 import {
   MutationCustomerActivateArgs,
   MutationCustomerActivateByUrlArgs,
-} from '../schema'
-import { Mutation } from '../schema'
+} from '../../schema'
+import { Mutation } from '../../schema'
 import { customerActivateByUrlMutation } from './mutations'
 
 const handleAccountActivation = async (
diff --git a/framework/shopify/utils/handle-login.ts b/framework/shopify/utils/handle-login.ts
index de86fa1d2..a9da10c57 100644
--- a/framework/shopify/utils/handle-login.ts
+++ b/framework/shopify/utils/handle-login.ts
@@ -1,5 +1,5 @@
 import { FetcherOptions } from '@commerce/utils/types'
-import { CustomerAccessTokenCreateInput } from '../schema'
+import { CustomerAccessTokenCreateInput } from '../../schema'
 import { setCustomerToken } from './customer-token'
 import { customerAccessTokenCreateMutation } from './mutations'
 import throwUserErrors from './throw-user-errors'
diff --git a/framework/shopify/utils/normalize.ts b/framework/shopify/utils/normalize.ts
index 96262f418..a9ee7e3b6 100644
--- a/framework/shopify/utils/normalize.ts
+++ b/framework/shopify/utils/normalize.ts
@@ -15,7 +15,7 @@ import {
   Page as ShopifyPage,
   PageEdge,
   Collection,
-} from '../schema'
+} from '../../schema'
 import { colorMap } from '@lib/colors'
 
 const money = ({ amount, currencyCode }: MoneyV2) => {
diff --git a/framework/shopify/utils/throw-user-errors.ts b/framework/shopify/utils/throw-user-errors.ts
index 5488ba282..503894d0c 100644
--- a/framework/shopify/utils/throw-user-errors.ts
+++ b/framework/shopify/utils/throw-user-errors.ts
@@ -5,7 +5,7 @@ import {
   CheckoutUserError,
   CustomerErrorCode,
   CustomerUserError,
-} from '../schema'
+} from '../../schema'
 
 export type UserErrors = Array<CheckoutUserError | CustomerUserError>
 
diff --git a/framework/shopify/wishlist/use-wishlist.tsx b/framework/shopify/wishlist/use-wishlist.tsx
index d2ce9db5b..03d70dc61 100644
--- a/framework/shopify/wishlist/use-wishlist.tsx
+++ b/framework/shopify/wishlist/use-wishlist.tsx
@@ -2,7 +2,7 @@
 // Shopify doesn't have a wishlist
 
 import { HookFetcher } from '@commerce/utils/types'
-import { Product } from '../schema'
+import { Product } from '../../schema'
 
 const defaultOpts = {}
 
diff --git a/framework/swell/api/operations/get-page.ts b/framework/swell/api/operations/get-page.ts
index 99fbac04d..60d40e03b 100644
--- a/framework/swell/api/operations/get-page.ts
+++ b/framework/swell/api/operations/get-page.ts
@@ -1,4 +1,4 @@
-import { Page } from '../../schema'
+import { Page } from '../../../schema'
 import { SwellConfig, Provider } from '..'
 import { OperationContext, OperationOptions } from '@commerce/api/operations'
 import { GetPageOperation } from '../../types/page'
diff --git a/framework/swell/auth/use-login.tsx b/framework/swell/auth/use-login.tsx
index 5a34975fa..6c6eeb61b 100644
--- a/framework/swell/auth/use-login.tsx
+++ b/framework/swell/auth/use-login.tsx
@@ -6,7 +6,7 @@ import {
   CustomerUserError,
   Mutation,
   MutationCheckoutCreateArgs,
-} from '../schema'
+} from '../../schema'
 import useLogin, { UseLogin } from '@commerce/auth/use-login'
 import { LoginHook } from '../types/login'
 import { setCustomerToken } from '../utils'
diff --git a/framework/swell/cart/utils/checkout-to-cart.ts b/framework/swell/cart/utils/checkout-to-cart.ts
index d6dfda206..dc31d9429 100644
--- a/framework/swell/cart/utils/checkout-to-cart.ts
+++ b/framework/swell/cart/utils/checkout-to-cart.ts
@@ -6,7 +6,7 @@ import {
   CheckoutLineItemsRemovePayload,
   CheckoutLineItemsUpdatePayload,
   Maybe,
-} from '../../schema'
+} from '../../../schema'
 import { normalizeCart } from '../../utils'
 
 export type CheckoutPayload =
diff --git a/framework/swell/utils/normalize.ts b/framework/swell/utils/normalize.ts
index 2306f0662..9bbad5961 100644
--- a/framework/swell/utils/normalize.ts
+++ b/framework/swell/utils/normalize.ts
@@ -1,6 +1,6 @@
 import { Customer } from '../types/customer'
 import { Product, ProductOption } from '../types/product'
-import { MoneyV2 } from '../schema'
+import { MoneyV2 } from '../../schema'
 
 import type {
   Cart,
diff --git a/framework/swell/wishlist/use-wishlist.tsx b/framework/swell/wishlist/use-wishlist.tsx
index cd1bfa0ad..7f50cdeb4 100644
--- a/framework/swell/wishlist/use-wishlist.tsx
+++ b/framework/swell/wishlist/use-wishlist.tsx
@@ -2,7 +2,7 @@
 // Swell doesn't have a wishlist
 
 import { HookFetcher } from '@commerce/utils/types'
-import { Product } from '../schema'
+import { Product } from '../../schema'
 
 const defaultOpts = {}
 
diff --git a/framework/vendure/api/operations/get-all-product-paths.ts b/framework/vendure/api/operations/get-all-product-paths.ts
index 54ca3b136..cff932d40 100644
--- a/framework/vendure/api/operations/get-all-product-paths.ts
+++ b/framework/vendure/api/operations/get-all-product-paths.ts
@@ -1,5 +1,5 @@
 import { OperationContext, OperationOptions } from '@commerce/api/operations'
-import type { GetAllProductPathsQuery } from '../../schema'
+import type { GetAllProductPathsQuery } from '../../../schema'
 import { Provider } from '../index'
 import { getAllProductPathsQuery } from '../../utils/queries/get-all-product-paths-query'
 import { GetAllProductPathsOperation } from '@commerce/types/product'
diff --git a/framework/vendure/api/operations/get-all-products.ts b/framework/vendure/api/operations/get-all-products.ts
index 68d4ce9b7..25d2cdd17 100644
--- a/framework/vendure/api/operations/get-all-products.ts
+++ b/framework/vendure/api/operations/get-all-products.ts
@@ -1,6 +1,6 @@
 import { Product } from '@commerce/types/product'
 import { Provider, VendureConfig } from '../'
-import { GetAllProductsQuery } from '../../schema'
+import { GetAllProductsQuery } from '../../../schema'
 import { normalizeSearchResult } from '../../utils/normalize'
 import { getAllProductsQuery } from '../../utils/queries/get-all-products-query'
 import { OperationContext } from '@commerce/api/operations'
diff --git a/framework/vendure/api/operations/get-product.ts b/framework/vendure/api/operations/get-product.ts
index 4ab9ed2d9..27162b4ae 100644
--- a/framework/vendure/api/operations/get-product.ts
+++ b/framework/vendure/api/operations/get-product.ts
@@ -1,7 +1,7 @@
 import { Product } from '@commerce/types/product'
 import { OperationContext } from '@commerce/api/operations'
 import { Provider, VendureConfig } from '../'
-import { GetProductQuery } from '../../schema'
+import { GetProductQuery } from '../../../schema'
 import { getProductQuery } from '../../utils/queries/get-product-query'
 
 export default function getProductOperation({
diff --git a/framework/vendure/api/operations/get-site-info.ts b/framework/vendure/api/operations/get-site-info.ts
index acfcea424..a8d17db99 100644
--- a/framework/vendure/api/operations/get-site-info.ts
+++ b/framework/vendure/api/operations/get-site-info.ts
@@ -1,5 +1,5 @@
 import { Provider, VendureConfig } from '../'
-import { GetCollectionsQuery } from '../../schema'
+import { GetCollectionsQuery } from '../../../schema'
 import { arrayToTree } from '../../utils/array-to-tree'
 import { getCollectionsQuery } from '../../utils/queries/get-collections-query'
 import { OperationContext } from '@commerce/api/operations'
diff --git a/framework/vendure/api/operations/login.ts b/framework/vendure/api/operations/login.ts
index 4ad408e0a..f18c64b7b 100644
--- a/framework/vendure/api/operations/login.ts
+++ b/framework/vendure/api/operations/login.ts
@@ -5,7 +5,7 @@ import type {
 } from '@commerce/api/operations'
 import { ValidationError } from '@commerce/utils/errors'
 import type { LoginOperation } from '../../types/login'
-import type { LoginMutation } from '../../schema'
+import type { LoginMutation } from '../../../schema'
 import { Provider, VendureConfig } from '..'
 import { loginMutation } from '../../utils/mutations/log-in-mutation'
 
diff --git a/framework/vendure/auth/use-login.tsx b/framework/vendure/auth/use-login.tsx
index a9b63e895..4b3d09f8e 100644
--- a/framework/vendure/auth/use-login.tsx
+++ b/framework/vendure/auth/use-login.tsx
@@ -4,7 +4,7 @@ import useLogin, { UseLogin } from '@commerce/auth/use-login'
 import { LoginHook } from '../types/login'
 import { CommerceError, ValidationError } from '@commerce/utils/errors'
 import useCustomer from '../customer/use-customer'
-import { LoginMutation, LoginMutationVariables } from '../schema'
+import { LoginMutation, LoginMutationVariables } from '../../schema'
 import { loginMutation } from '../utils/mutations/log-in-mutation'
 
 export default useLogin as UseLogin<typeof handler>
diff --git a/framework/vendure/auth/use-logout.tsx b/framework/vendure/auth/use-logout.tsx
index be1b18586..b01e2b8f9 100644
--- a/framework/vendure/auth/use-logout.tsx
+++ b/framework/vendure/auth/use-logout.tsx
@@ -2,7 +2,7 @@ import { useCallback } from 'react'
 import { MutationHook } from '@commerce/utils/types'
 import useLogout, { UseLogout } from '@commerce/auth/use-logout'
 import useCustomer from '../customer/use-customer'
-import { LogoutMutation } from '../schema'
+import { LogoutMutation } from '../../schema'
 import { logoutMutation } from '../utils/mutations/log-out-mutation'
 import { LogoutHook } from '../types/logout'
 
diff --git a/framework/vendure/auth/use-signup.tsx b/framework/vendure/auth/use-signup.tsx
index 4018baed6..9705d0450 100644
--- a/framework/vendure/auth/use-signup.tsx
+++ b/framework/vendure/auth/use-signup.tsx
@@ -7,7 +7,7 @@ import {
   RegisterCustomerInput,
   SignupMutation,
   SignupMutationVariables,
-} from '../schema'
+} from '../../schema'
 import { signupMutation } from '../utils/mutations/sign-up-mutation'
 import { SignupHook } from '../types/signup'
 
diff --git a/framework/vendure/cart/use-add-item.tsx b/framework/vendure/cart/use-add-item.tsx
index 7c131eaea..15424c160 100644
--- a/framework/vendure/cart/use-add-item.tsx
+++ b/framework/vendure/cart/use-add-item.tsx
@@ -3,7 +3,7 @@ import { CommerceError } from '@commerce/utils/errors'
 import { MutationHook } from '@commerce/utils/types'
 import { useCallback } from 'react'
 import useCart from './use-cart'
-import { AddItemToOrderMutation } from '../schema'
+import { AddItemToOrderMutation } from '../../schema'
 import { normalizeCart } from '../utils/normalize'
 import { addItemToOrderMutation } from '../utils/mutations/add-item-to-order-mutation'
 import { AddItemHook } from '../types/cart'
diff --git a/framework/vendure/cart/use-cart.tsx b/framework/vendure/cart/use-cart.tsx
index de42036b8..e053f1fb3 100644
--- a/framework/vendure/cart/use-cart.tsx
+++ b/framework/vendure/cart/use-cart.tsx
@@ -1,6 +1,6 @@
 import { SWRHook } from '@commerce/utils/types'
 import useCart, { UseCart } from '@commerce/cart/use-cart'
-import { ActiveOrderQuery, CartFragment } from '../schema'
+import { ActiveOrderQuery, CartFragment } from '../../schema'
 import { normalizeCart } from '../utils/normalize'
 import { useMemo } from 'react'
 import { getCartQuery } from '../utils/queries/get-cart-query'
diff --git a/framework/vendure/cart/use-remove-item.tsx b/framework/vendure/cart/use-remove-item.tsx
index dde8e18b3..deba7e096 100644
--- a/framework/vendure/cart/use-remove-item.tsx
+++ b/framework/vendure/cart/use-remove-item.tsx
@@ -12,7 +12,7 @@ import useCart from './use-cart'
 import {
   RemoveOrderLineMutation,
   RemoveOrderLineMutationVariables,
-} from '../schema'
+} from '../../schema'
 import { normalizeCart } from '../utils/normalize'
 import { RemoveItemHook } from '../types/cart'
 import { removeOrderLineMutation } from '../utils/mutations/remove-order-line-mutation'
diff --git a/framework/vendure/cart/use-update-item.tsx b/framework/vendure/cart/use-update-item.tsx
index 029966c5a..8aa02efd7 100644
--- a/framework/vendure/cart/use-update-item.tsx
+++ b/framework/vendure/cart/use-update-item.tsx
@@ -11,7 +11,7 @@ import useCart from './use-cart'
 import {
   AdjustOrderLineMutation,
   AdjustOrderLineMutationVariables,
-} from '../schema'
+} from '../../schema'
 import { normalizeCart } from '../utils/normalize'
 import { adjustOrderLineMutation } from '../utils/mutations/adjust-order-line-mutation'
 import { UpdateItemHook } from '../types/cart'
diff --git a/framework/vendure/customer/use-customer.tsx b/framework/vendure/customer/use-customer.tsx
index e9047485b..ed901d956 100644
--- a/framework/vendure/customer/use-customer.tsx
+++ b/framework/vendure/customer/use-customer.tsx
@@ -1,6 +1,6 @@
 import { SWRHook } from '@commerce/utils/types'
 import useCustomer, { UseCustomer } from '@commerce/customer/use-customer'
-import { ActiveCustomerQuery } from '../schema'
+import { ActiveCustomerQuery } from '../../schema'
 import { activeCustomerQuery } from '../utils/queries/active-customer-query'
 import { CustomerHook } from '../types/customer'
 
diff --git a/framework/vendure/product/use-search.tsx b/framework/vendure/product/use-search.tsx
index 827b23623..adbe2af6b 100644
--- a/framework/vendure/product/use-search.tsx
+++ b/framework/vendure/product/use-search.tsx
@@ -1,7 +1,7 @@
 import { SWRHook } from '@commerce/utils/types'
 import useSearch, { UseSearch } from '@commerce/product/use-search'
 import { Product } from '@commerce/types/product'
-import { SearchQuery, SearchQueryVariables } from '../schema'
+import { SearchQuery, SearchQueryVariables } from '../../schema'
 import { normalizeSearchResult } from '../utils/normalize'
 import { searchQuery } from '../utils/queries/search-query'
 import { SearchProductsHook } from '../types/product'
diff --git a/framework/vendure/types/login.ts b/framework/vendure/types/login.ts
index 16bae8f65..7d7531572 100644
--- a/framework/vendure/types/login.ts
+++ b/framework/vendure/types/login.ts
@@ -1,5 +1,5 @@
 import * as Core from '@commerce/types/login'
-import type { LoginMutationVariables } from '../schema'
+import type { LoginMutationVariables } from '../../schema'
 import { LoginBody, LoginTypes } from '@commerce/types/login'
 
 export * from '@commerce/types/login'
diff --git a/framework/vendure/utils/normalize.ts b/framework/vendure/utils/normalize.ts
index 6071fae84..77d31a77c 100644
--- a/framework/vendure/utils/normalize.ts
+++ b/framework/vendure/utils/normalize.ts
@@ -1,6 +1,6 @@
 import { Product } from '@commerce/types/product'
 import { Cart } from '@commerce/types/cart'
-import { CartFragment, SearchResultFragment } from '../schema'
+import { CartFragment, SearchResultFragment } from '../../schema'
 
 export function normalizeSearchResult(item: SearchResultFragment): Product {
   return {
diff --git a/framework/vendure/wishlist/use-wishlist.tsx b/framework/vendure/wishlist/use-wishlist.tsx
index da941bf31..a4c2e87fb 100644
--- a/framework/vendure/wishlist/use-wishlist.tsx
+++ b/framework/vendure/wishlist/use-wishlist.tsx
@@ -2,7 +2,7 @@
 // Vendure doesn't have a built-in wishlist
 
 import { HookFetcher } from '@commerce/utils/types'
-import { Product } from '../schema'
+import { Product } from '../../schema'
 
 const defaultOpts = {}
 
diff --git a/package-lock.json b/package-lock.json
index 4d29a0cae..ac0563996 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1442,6 +1442,10 @@
       "resolved": "packages/ordercloud",
       "link": true
     },
+    "node_modules/@vercel/commerce-saleor": {
+      "resolved": "packages/saleor",
+      "link": true
+    },
     "node_modules/@vercel/fetch": {
       "version": "6.1.1",
       "resolved": "https://registry.npmjs.org/@vercel/fetch/-/fetch-6.1.1.tgz",
@@ -9659,6 +9663,42 @@
         "node": ">=4.2.0"
       }
     },
+    "packages/saleor": {
+      "version": "0.0.1",
+      "license": "MIT",
+      "dependencies": {
+        "@vercel/commerce": "^0.0.1",
+        "@vercel/fetch": "^6.1.1"
+      },
+      "devDependencies": {
+        "@types/node": "^15.12.4",
+        "@types/react": "^17.0.8",
+        "lint-staged": "^12.1.7",
+        "next": "^12.0.3",
+        "prettier": "^2.5.1",
+        "react": "^17.0.2",
+        "react-dom": "^17.0.2",
+        "typescript": "^4.6.0-dev.20220108"
+      },
+      "peerDependencies": {
+        "next": "^12",
+        "react": "^17",
+        "react-dom": "^17"
+      }
+    },
+    "packages/saleor/node_modules/typescript": {
+      "version": "4.6.0-dev.20220114",
+      "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.6.0-dev.20220114.tgz",
+      "integrity": "sha512-WcHfPkRCvsoV3BozLL1T8Eb7VPlsoA6yyRLFxoR1zVOyUdILHGL9GzXG5e2yzMCg4rQBTkTYZmkXTBZUwO5ONA==",
+      "dev": true,
+      "bin": {
+        "tsc": "bin/tsc",
+        "tsserver": "bin/tsserver"
+      },
+      "engines": {
+        "node": ">=4.2.0"
+      }
+    },
     "site": {
       "name": "next-commerce",
       "version": "0.0.1",
@@ -10905,7 +10945,30 @@
         "prettier": "^2.5.1",
         "react": "^17.0.2",
         "react-dom": "^17.0.2",
-        "stripe": "*",
+        "stripe": "^8.197.0",
+        "typescript": "^4.6.0-dev.20220108"
+      },
+      "dependencies": {
+        "typescript": {
+          "version": "4.6.0-dev.20220114",
+          "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.6.0-dev.20220114.tgz",
+          "integrity": "sha512-WcHfPkRCvsoV3BozLL1T8Eb7VPlsoA6yyRLFxoR1zVOyUdILHGL9GzXG5e2yzMCg4rQBTkTYZmkXTBZUwO5ONA==",
+          "dev": true
+        }
+      }
+    },
+    "@vercel/commerce-saleor": {
+      "version": "file:packages/saleor",
+      "requires": {
+        "@types/node": "^15.12.4",
+        "@types/react": "^17.0.8",
+        "@vercel/commerce": "^0.0.1",
+        "@vercel/fetch": "^6.1.1",
+        "lint-staged": "^12.1.7",
+        "next": "^12.0.3",
+        "prettier": "^2.5.1",
+        "react": "^17.0.2",
+        "react-dom": "^17.0.2",
         "typescript": "^4.6.0-dev.20220108"
       },
       "dependencies": {
diff --git a/packages/bigcommerce/src/api/endpoints/customer/get-logged-in-customer.ts b/packages/bigcommerce/src/api/endpoints/customer/get-logged-in-customer.ts
index 50bd5cf3f..4c93730f6 100644
--- a/packages/bigcommerce/src/api/endpoints/customer/get-logged-in-customer.ts
+++ b/packages/bigcommerce/src/api/endpoints/customer/get-logged-in-customer.ts
@@ -1,4 +1,4 @@
-import type { GetLoggedInCustomerQuery } from '../../../schema'
+import type { GetLoggedInCustomerQuery } from '../../../../schema'
 import type { CustomerEndpoint } from '.'
 
 export const getLoggedInCustomerQuery = /* GraphQL */ `
diff --git a/packages/bigcommerce/src/api/operations/get-all-product-paths.ts b/packages/bigcommerce/src/api/operations/get-all-product-paths.ts
index 3184e2fc1..90cdab6fd 100644
--- a/packages/bigcommerce/src/api/operations/get-all-product-paths.ts
+++ b/packages/bigcommerce/src/api/operations/get-all-product-paths.ts
@@ -2,7 +2,7 @@ import type {
   OperationContext,
   OperationOptions,
 } from '@vercel/commerce/api/operations'
-import type { GetAllProductPathsQuery } from '../../schema'
+import type { GetAllProductPathsQuery } from '../../../schema'
 import type { GetAllProductPathsOperation } from '../../types/product'
 import type { RecursivePartial, RecursiveRequired } from '../utils/types'
 import filterEdges from '../utils/filter-edges'
diff --git a/packages/bigcommerce/src/api/operations/get-all-products.ts b/packages/bigcommerce/src/api/operations/get-all-products.ts
index 01bde1a09..2833ffcd7 100644
--- a/packages/bigcommerce/src/api/operations/get-all-products.ts
+++ b/packages/bigcommerce/src/api/operations/get-all-products.ts
@@ -5,7 +5,7 @@ import type {
 import type {
   GetAllProductsQuery,
   GetAllProductsQueryVariables,
-} from '../../schema'
+} from '../../../schema'
 import type { GetAllProductsOperation } from '../../types/product'
 import type { RecursivePartial, RecursiveRequired } from '../utils/types'
 import filterEdges from '../utils/filter-edges'
diff --git a/packages/bigcommerce/src/api/operations/get-product.ts b/packages/bigcommerce/src/api/operations/get-product.ts
index d724c42ba..b2f9c9677 100644
--- a/packages/bigcommerce/src/api/operations/get-product.ts
+++ b/packages/bigcommerce/src/api/operations/get-product.ts
@@ -3,7 +3,7 @@ import type {
   OperationOptions,
 } from '@vercel/commerce/api/operations'
 import type { GetProductOperation } from '../../types/product'
-import type { GetProductQuery, GetProductQueryVariables } from '../../schema'
+import type { GetProductQuery, GetProductQueryVariables } from '../../../schema'
 import setProductLocaleMeta from '../utils/set-product-locale-meta'
 import { productInfoFragment } from '../fragments/product'
 import { BigcommerceConfig, Provider } from '..'
diff --git a/packages/bigcommerce/src/api/operations/get-site-info.ts b/packages/bigcommerce/src/api/operations/get-site-info.ts
index 334870ed7..ad0dd5ebd 100644
--- a/packages/bigcommerce/src/api/operations/get-site-info.ts
+++ b/packages/bigcommerce/src/api/operations/get-site-info.ts
@@ -3,7 +3,7 @@ import type {
   OperationOptions,
 } from '@vercel/commerce/api/operations'
 import type { GetSiteInfoOperation } from '../../types/site'
-import type { GetSiteInfoQuery } from '../../schema'
+import type { GetSiteInfoQuery } from '../../../schema'
 import filterEdges from '../utils/filter-edges'
 import type { BigcommerceConfig, Provider } from '..'
 import { categoryTreeItemFragment } from '../fragments/category-tree'
diff --git a/packages/bigcommerce/src/api/operations/login.ts b/packages/bigcommerce/src/api/operations/login.ts
index 604a1a52a..f5349998f 100644
--- a/packages/bigcommerce/src/api/operations/login.ts
+++ b/packages/bigcommerce/src/api/operations/login.ts
@@ -4,7 +4,7 @@ import type {
   OperationOptions,
 } from '@vercel/commerce/api/operations'
 import type { LoginOperation } from '../../types/login'
-import type { LoginMutation } from '../../schema'
+import type { LoginMutation } from '../../../schema'
 import type { RecursivePartial } from '../utils/types'
 import concatHeader from '../utils/concat-cookie'
 import type { BigcommerceConfig, Provider } from '..'
diff --git a/packages/bigcommerce/src/api/utils/get-customer-id.ts b/packages/bigcommerce/src/api/utils/get-customer-id.ts
index 7efeeed3c..7344e017b 100644
--- a/packages/bigcommerce/src/api/utils/get-customer-id.ts
+++ b/packages/bigcommerce/src/api/utils/get-customer-id.ts
@@ -1,4 +1,4 @@
-import type { GetCustomerIdQuery } from '../../schema'
+import type { GetCustomerIdQuery } from '../../../schema'
 import type { BigcommerceConfig } from '../'
 
 export const getCustomerIdQuery = /* GraphQL */ `
diff --git a/packages/bigcommerce/src/types/login.ts b/packages/bigcommerce/src/types/login.ts
index 643a0cc96..eff27ca46 100644
--- a/packages/bigcommerce/src/types/login.ts
+++ b/packages/bigcommerce/src/types/login.ts
@@ -1,5 +1,5 @@
 import * as Core from '@vercel/commerce/types/login'
-import type { LoginMutationVariables } from '../schema'
+import type { LoginMutationVariables } from '../../schema'
 
 export * from '@vercel/commerce/types/login'
 
diff --git a/packages/bigcommerce/src/types/site.ts b/packages/bigcommerce/src/types/site.ts
index 44e03f9ee..5c3074cc9 100644
--- a/packages/bigcommerce/src/types/site.ts
+++ b/packages/bigcommerce/src/types/site.ts
@@ -1,5 +1,5 @@
 import * as Core from '@vercel/commerce/types/site'
-import type { GetSiteInfoQuery, GetSiteInfoQueryVariables } from '../schema'
+import type { GetSiteInfoQuery, GetSiteInfoQueryVariables } from '../../schema'
 
 export * from '@vercel/commerce/types/site'
 
diff --git a/packages/kibocommerce/src/api/endpoints/cart/get-cart.ts b/packages/kibocommerce/src/api/endpoints/cart/get-cart.ts
index 6a6ec3ab4..601cdc97f 100644
--- a/packages/kibocommerce/src/api/endpoints/cart/get-cart.ts
+++ b/packages/kibocommerce/src/api/endpoints/cart/get-cart.ts
@@ -1,6 +1,6 @@
 import CookieHandler from '../../../api/utils/cookie-handler'
 import { normalizeCart } from '../../../lib/normalize'
-import { Cart } from '../../../../schema'
+import { Cart } from '../../../../../schema'
 import type { CartEndpoint } from '.'
 import { getCartQuery } from '../../queries/get-cart-query'
 
diff --git a/packages/kibocommerce/src/api/operations/get-page.ts b/packages/kibocommerce/src/api/operations/get-page.ts
index 69289cba0..467c436c8 100644
--- a/packages/kibocommerce/src/api/operations/get-page.ts
+++ b/packages/kibocommerce/src/api/operations/get-page.ts
@@ -5,7 +5,7 @@ import type { KiboCommerceConfig, KiboCommerceProvider } from '..'
 import { normalizePage } from '../../lib/normalize'
 import { getPageQuery } from '../queries/get-page-query'
 import type { Page, GetPageQueryParams } from "../../types/page";
-import type { Document } from '../../../schema'
+import type { Document } from '../../../../schema'
 
 export default function getPageOperation({
   commerce,
diff --git a/packages/kibocommerce/src/lib/normalize.ts b/packages/kibocommerce/src/lib/normalize.ts
index 00d0a44c7..9194b3e4b 100644
--- a/packages/kibocommerce/src/lib/normalize.ts
+++ b/packages/kibocommerce/src/lib/normalize.ts
@@ -1,6 +1,6 @@
 import update from './immutability'
 import getSlug from './get-slug'
-import type { PrCategory, CustomerAccountInput, Document } from '../../schema'
+import type { PrCategory, CustomerAccountInput, Document } from '../../../schema'
 import { Page } from '../types/page';
 import { Customer } from '../types/customer'
 
diff --git a/packages/kibocommerce/src/types/login.ts b/packages/kibocommerce/src/types/login.ts
index 2e7b198b2..630eecf58 100644
--- a/packages/kibocommerce/src/types/login.ts
+++ b/packages/kibocommerce/src/types/login.ts
@@ -1,5 +1,5 @@
 import * as Core from '@vercel/commerce/types/login'
-import type { CustomerUserAuthInfoInput } from '../../schema'
+import type { CustomerUserAuthInfoInput } from '../../../schema'
 
 export * from '@vercel/commerce/types/login'
 
diff --git a/packages/saleor/.prettierignore b/packages/saleor/.prettierignore
new file mode 100644
index 000000000..f06235c46
--- /dev/null
+++ b/packages/saleor/.prettierignore
@@ -0,0 +1,2 @@
+node_modules
+dist
diff --git a/packages/saleor/.prettierrc b/packages/saleor/.prettierrc
new file mode 100644
index 000000000..e1076edfa
--- /dev/null
+++ b/packages/saleor/.prettierrc
@@ -0,0 +1,6 @@
+{
+  "semi": false,
+  "singleQuote": true,
+  "tabWidth": 2,
+  "useTabs": false
+}
diff --git a/packages/saleor/package.json b/packages/saleor/package.json
new file mode 100644
index 000000000..a65ad116b
--- /dev/null
+++ b/packages/saleor/package.json
@@ -0,0 +1,73 @@
+{
+  "name": "@vercel/commerce-saleor",
+  "version": "0.0.1",
+  "license": "MIT",
+  "scripts": {
+    "build": "rm -fr dist/* && tsc",
+    "dev": "npm run build -- --watch",
+    "prettier-fix": "prettier --write ."
+  },
+  "sideEffects": false,
+  "type": "module",
+  "exports": {
+    ".": "./dist/index.js",
+    "./*": [
+      "./dist/*.js",
+      "./dist/*/index.js"
+    ],
+    "./next.config": "./dist/next.config.cjs"
+  },
+  "typesVersions": {
+    "*": {
+      "*": [
+        "dist/*",
+        "dist/*/index"
+      ],
+      "next.config": [
+        "dist/next.config.d.cts"
+      ]
+    }
+  },
+  "files": [
+    "dist",
+    "schema.d.ts"
+  ],
+  "publishConfig": {
+    "typesVersions": {
+      "*": {
+        "*": [
+          "src/*.d.ts",
+          "src/*/index.d.ts"
+        ],
+        "next.config": [
+          "dist/next.config.d.cts"
+        ]
+      }
+    }
+  },
+  "dependencies": {
+    "@vercel/commerce": "^0.0.1",
+    "@vercel/fetch": "^6.1.1"
+  },
+  "peerDependencies": {
+    "next": "^12",
+    "react": "^17",
+    "react-dom": "^17"
+  },
+  "devDependencies": {
+    "@types/node": "^15.12.4",
+    "@types/react": "^17.0.8",
+    "lint-staged": "^12.1.7",
+    "next": "^12.0.3",
+    "prettier": "^2.5.1",
+    "react": "^17.0.2",
+    "react-dom": "^17.0.2",
+    "typescript": "^4.6.0-dev.20220108"
+  },
+  "lint-staged": {
+    "**/*.{js,jsx,ts,tsx,json}": [
+      "prettier --write",
+      "git add"
+    ]
+  }
+}
diff --git a/packages/saleor/src/api/endpoints/checkout/index.ts b/packages/saleor/src/api/endpoints/checkout/index.ts
index 2113a64d3..2468c8d97 100644
--- a/packages/saleor/src/api/endpoints/checkout/index.ts
+++ b/packages/saleor/src/api/endpoints/checkout/index.ts
@@ -1,6 +1,6 @@
-import { CommerceAPI, GetAPISchema, createEndpoint } from '@commerce/api'
-import checkoutEndpoint from '@commerce/api/endpoints/checkout'
-import { CheckoutSchema } from '@commerce/types/checkout'
+import { CommerceAPI, GetAPISchema, createEndpoint } from '@vercel/commerce/api'
+import checkoutEndpoint from '@vercel/commerce/api/endpoints/checkout'
+import { CheckoutSchema } from '@vercel/commerce/types/checkout'
 
 export type CheckoutAPI = GetAPISchema<CommerceAPI, CheckoutSchema>
 
diff --git a/packages/saleor/src/api/index.ts b/packages/saleor/src/api/index.ts
index 074607666..7ee17f693 100644
--- a/packages/saleor/src/api/index.ts
+++ b/packages/saleor/src/api/index.ts
@@ -1,4 +1,4 @@
-import { CommerceAPI, CommerceAPIConfig, getCommerceApi as commerceApi } from '@commerce/api'
+import { CommerceAPI, CommerceAPIConfig, getCommerceApi as commerceApi } from '@vercel/commerce/api'
 import * as operations from './operations'
 import * as Const from '../const'
 
diff --git a/packages/saleor/src/api/operations/get-all-pages.ts b/packages/saleor/src/api/operations/get-all-pages.ts
index 7ba07450d..37f2e3ab2 100644
--- a/packages/saleor/src/api/operations/get-all-pages.ts
+++ b/packages/saleor/src/api/operations/get-all-pages.ts
@@ -1,6 +1,6 @@
-import type { OperationContext } from '@commerce/api/operations'
+import type { OperationContext } from '@vercel/commerce/api/operations'
 
-import { QueryPagesArgs, PageCountableEdge } from '../../schema'
+import { QueryPagesArgs, PageCountableEdge } from '../../../schema'
 import type { SaleorConfig, Provider } from '..'
 import * as Query from '../../utils/queries'
 
diff --git a/packages/saleor/src/api/operations/get-all-product-paths.ts b/packages/saleor/src/api/operations/get-all-product-paths.ts
index c04964147..66e8f95c9 100644
--- a/packages/saleor/src/api/operations/get-all-product-paths.ts
+++ b/packages/saleor/src/api/operations/get-all-product-paths.ts
@@ -1,5 +1,5 @@
-import type { OperationContext } from '@commerce/api/operations'
-import { ProductCountableEdge } from '../../schema'
+import type { OperationContext } from '@vercel/commerce/api/operations'
+import { ProductCountableEdge } from '../../../schema'
 import type { Provider, SaleorConfig } from '..'
 
 import { getAllProductsPathsQuery } from '../../utils/queries'
diff --git a/packages/saleor/src/api/operations/get-all-products.ts b/packages/saleor/src/api/operations/get-all-products.ts
index 4cb7555d6..f7982adee 100644
--- a/packages/saleor/src/api/operations/get-all-products.ts
+++ b/packages/saleor/src/api/operations/get-all-products.ts
@@ -1,12 +1,12 @@
-import type { OperationContext } from '@commerce/api/operations'
-import { Product } from '@commerce/types/product'
+import type { OperationContext } from '@vercel/commerce/api/operations'
+import { Product } from '@vercel/commerce/types/product'
 
-import { ProductCountableEdge } from '../../schema'
+import { ProductCountableEdge } from '../../../schema'
 import type { Provider, SaleorConfig } from '..'
 import { normalizeProduct } from '../../utils'
 
 import * as Query from '../../utils/queries'
-import { GraphQLFetcherResult } from '@commerce/api'
+import { GraphQLFetcherResult } from '@vercel/commerce/api'
 
 type ReturnType = {
   products: Product[]
diff --git a/packages/saleor/src/api/operations/get-page.ts b/packages/saleor/src/api/operations/get-page.ts
index 1e6c8cf2b..bab9d92c5 100644
--- a/packages/saleor/src/api/operations/get-page.ts
+++ b/packages/saleor/src/api/operations/get-page.ts
@@ -1,6 +1,6 @@
-import type { OperationContext } from '@commerce/api/operations'
+import type { OperationContext } from '@vercel/commerce/api/operations'
 import type { Provider, SaleorConfig } from '..'
-import { QueryPageArgs } from '../../schema'
+import { QueryPageArgs } from '../../../schema'
 
 import * as Query from '../../utils/queries'
 
diff --git a/packages/saleor/src/api/operations/get-product.ts b/packages/saleor/src/api/operations/get-product.ts
index e5e8e596f..5a33dec7b 100644
--- a/packages/saleor/src/api/operations/get-product.ts
+++ b/packages/saleor/src/api/operations/get-product.ts
@@ -1,4 +1,4 @@
-import type { OperationContext } from '@commerce/api/operations'
+import type { OperationContext } from '@vercel/commerce/api/operations'
 import { normalizeProduct } from '../../utils'
 import type { Provider, SaleorConfig } from '..'
 
diff --git a/packages/saleor/src/api/operations/get-site-info.ts b/packages/saleor/src/api/operations/get-site-info.ts
index 917b96ce4..6ce7408e4 100644
--- a/packages/saleor/src/api/operations/get-site-info.ts
+++ b/packages/saleor/src/api/operations/get-site-info.ts
@@ -1,5 +1,5 @@
-import type { OperationContext } from '@commerce/api/operations'
-import { Category } from '@commerce/types/site'
+import type { OperationContext } from '@vercel/commerce/api/operations'
+import { Category } from '@vercel/commerce/types/site'
 import type { SaleorConfig, Provider } from '..'
 
 import { getCategories, getVendors } from '../../utils'
diff --git a/packages/saleor/src/api/operations/login.ts b/packages/saleor/src/api/operations/login.ts
index 9d3a7fe9f..76d1e7844 100644
--- a/packages/saleor/src/api/operations/login.ts
+++ b/packages/saleor/src/api/operations/login.ts
@@ -1,5 +1,5 @@
 import type { ServerResponse } from 'http'
-import type { OperationContext } from '@commerce/api/operations'
+import type { OperationContext } from '@vercel/commerce/api/operations'
 import type { Provider, SaleorConfig } from '..'
 import { throwUserErrors } from '../../utils'
 
diff --git a/packages/saleor/src/api/utils/fetch-all-products.ts b/packages/saleor/src/api/utils/fetch-all-products.ts
index 1cfb3157c..761e1271d 100644
--- a/packages/saleor/src/api/utils/fetch-all-products.ts
+++ b/packages/saleor/src/api/utils/fetch-all-products.ts
@@ -1,4 +1,4 @@
-import { ProductCountableEdge } from '../../schema'
+import { ProductCountableEdge } from '../../../schema'
 import { SaleorConfig } from '..'
 
 const fetchAllProducts = async ({
diff --git a/packages/saleor/src/api/utils/fetch-graphql-api.ts b/packages/saleor/src/api/utils/fetch-graphql-api.ts
index 3145409ad..de4d45aae 100644
--- a/packages/saleor/src/api/utils/fetch-graphql-api.ts
+++ b/packages/saleor/src/api/utils/fetch-graphql-api.ts
@@ -1,4 +1,4 @@
-import type { GraphQLFetcher } from '@commerce/api'
+import type { GraphQLFetcher } from '@vercel/commerce/api'
 import fetch from './fetch'
 
 import { API_URL } from '../../const'
diff --git a/packages/saleor/src/auth/use-login.tsx b/packages/saleor/src/auth/use-login.tsx
index 2a31c932b..768e53378 100644
--- a/packages/saleor/src/auth/use-login.tsx
+++ b/packages/saleor/src/auth/use-login.tsx
@@ -1,13 +1,13 @@
 import { useCallback } from 'react'
 
-import type { MutationHook } from '@commerce/utils/types'
-import { CommerceError } from '@commerce/utils/errors'
+import type { MutationHook } from '@vercel/commerce/utils/types'
+import { CommerceError } from '@vercel/commerce/utils/errors'
 import useCustomer from '../customer/use-customer'
 import * as mutation from '../utils/mutations'
-import { Mutation, MutationTokenCreateArgs } from '../schema'
-import useLogin, { UseLogin } from '@commerce/auth/use-login'
+import { Mutation, MutationTokenCreateArgs } from '../../schema'
+import useLogin, { UseLogin } from '@vercel/commerce/auth/use-login'
 import { setCSRFToken, setToken, throwUserErrors, checkoutAttach, getCheckoutId } from '../utils'
-import { LoginHook } from '@commerce/types/login'
+import { LoginHook } from '@vercel/commerce/types/login'
 
 export default useLogin as UseLogin<typeof handler>
 
diff --git a/packages/saleor/src/auth/use-logout.tsx b/packages/saleor/src/auth/use-logout.tsx
index fe75df84b..396cb472a 100644
--- a/packages/saleor/src/auth/use-logout.tsx
+++ b/packages/saleor/src/auth/use-logout.tsx
@@ -1,10 +1,10 @@
 import { useCallback } from 'react'
-import type { MutationHook } from '@commerce/utils/types'
-import useLogout, { UseLogout } from '@commerce/auth/use-logout'
+import type { MutationHook } from '@vercel/commerce/utils/types'
+import useLogout, { UseLogout } from '@vercel/commerce/auth/use-logout'
 import useCustomer from '../customer/use-customer'
 import * as mutation from '../utils/mutations'
 import { setCSRFToken, setToken, setCheckoutToken } from '../utils/customer-token'
-import { LogoutHook } from '@commerce/types/logout'
+import { LogoutHook } from '@vercel/commerce/types/logout'
 
 export default useLogout as UseLogout<typeof handler>
 
diff --git a/packages/saleor/src/auth/use-signup.tsx b/packages/saleor/src/auth/use-signup.tsx
index 06df516a5..aca861784 100644
--- a/packages/saleor/src/auth/use-signup.tsx
+++ b/packages/saleor/src/auth/use-signup.tsx
@@ -1,13 +1,13 @@
 import { useCallback } from 'react'
-import type { MutationHook } from '@commerce/utils/types'
-import { CommerceError } from '@commerce/utils/errors'
-import useSignup, { UseSignup } from '@commerce/auth/use-signup'
+import type { MutationHook } from '@vercel/commerce/utils/types'
+import { CommerceError } from '@vercel/commerce/utils/errors'
+import useSignup, { UseSignup } from '@vercel/commerce/auth/use-signup'
 import useCustomer from '../customer/use-customer'
-import { AccountRegisterInput, Mutation, MutationAccountRegisterArgs } from '../schema'
+import { AccountRegisterInput, Mutation, MutationAccountRegisterArgs } from '../../schema'
 
 import * as mutation from '../utils/mutations'
 import { handleAutomaticLogin, throwUserErrors } from '../utils'
-import { SignupHook } from '@commerce/types/signup'
+import { SignupHook } from '@vercel/commerce/types/signup'
 
 export default useSignup as UseSignup<typeof handler>
 
diff --git a/packages/saleor/src/cart/use-add-item.tsx b/packages/saleor/src/cart/use-add-item.tsx
index 3af368e70..2db070233 100644
--- a/packages/saleor/src/cart/use-add-item.tsx
+++ b/packages/saleor/src/cart/use-add-item.tsx
@@ -1,15 +1,15 @@
 import { useCallback } from 'react'
-import type { MutationHook } from '@commerce/utils/types'
-import { CommerceError } from '@commerce/utils/errors'
-import useAddItem, { UseAddItem } from '@commerce/cart/use-add-item'
+import type { MutationHook } from '@vercel/commerce/utils/types'
+import { CommerceError } from '@vercel/commerce/utils/errors'
+import useAddItem, { UseAddItem } from '@vercel/commerce/cart/use-add-item'
 import useCart from './use-cart'
 
 import * as mutation from '../utils/mutations'
 
 import { getCheckoutId, checkoutToCart } from '../utils'
 
-import { Mutation, MutationCheckoutLinesAddArgs } from '../schema'
-import { AddItemHook } from '@commerce/types/cart'
+import { Mutation, MutationCheckoutLinesAddArgs } from '../../schema'
+import { AddItemHook } from '@vercel/commerce/types/cart'
 
 export default useAddItem as UseAddItem<typeof handler>
 
diff --git a/packages/saleor/src/cart/use-cart.tsx b/packages/saleor/src/cart/use-cart.tsx
index ab80ea395..9360875d4 100644
--- a/packages/saleor/src/cart/use-cart.tsx
+++ b/packages/saleor/src/cart/use-cart.tsx
@@ -1,10 +1,10 @@
 import { useMemo } from 'react'
-import useCommerceCart, { UseCart } from '@commerce/cart/use-cart'
+import useCommerceCart, { UseCart } from '@vercel/commerce/cart/use-cart'
 
-import { SWRHook } from '@commerce/utils/types'
+import { SWRHook } from '@vercel/commerce/utils/types'
 import { checkoutCreate, checkoutToCart, getCheckoutId } from '../utils'
 import * as query from '../utils/queries'
-import { GetCartHook } from '@commerce/types/cart'
+import { GetCartHook } from '@vercel/commerce/types/cart'
 
 export default useCommerceCart as UseCart<typeof handler>
 
diff --git a/packages/saleor/src/cart/use-remove-item.tsx b/packages/saleor/src/cart/use-remove-item.tsx
index 17be31e0c..09d1acab7 100644
--- a/packages/saleor/src/cart/use-remove-item.tsx
+++ b/packages/saleor/src/cart/use-remove-item.tsx
@@ -1,10 +1,10 @@
 import { useCallback } from 'react'
-import type { MutationHookContext, HookFetcherContext, MutationHook } from '@commerce/utils/types'
-import useRemoveItem, { UseRemoveItem } from '@commerce/cart/use-remove-item'
+import type { MutationHookContext, HookFetcherContext, MutationHook } from '@vercel/commerce/utils/types'
+import useRemoveItem, { UseRemoveItem } from '@vercel/commerce/cart/use-remove-item'
 import useCart from './use-cart'
 import * as mutation from '../utils/mutations'
 import { getCheckoutId, checkoutToCart } from '../utils'
-import { Mutation, MutationCheckoutLineDeleteArgs } from '../schema'
+import { Mutation, MutationCheckoutLineDeleteArgs } from '../../schema'
 import { LineItem, RemoveItemHook } from '../types/cart'
 
 export default useRemoveItem as UseRemoveItem<typeof handler>
diff --git a/packages/saleor/src/cart/use-update-item.tsx b/packages/saleor/src/cart/use-update-item.tsx
index bd596132d..ffca9b2f8 100644
--- a/packages/saleor/src/cart/use-update-item.tsx
+++ b/packages/saleor/src/cart/use-update-item.tsx
@@ -1,15 +1,15 @@
 import { useCallback } from 'react'
 import debounce from 'lodash.debounce'
-import type { HookFetcherContext, MutationHookContext } from '@commerce/utils/types'
-import { ValidationError } from '@commerce/utils/errors'
-import useUpdateItem, { UseUpdateItem } from '@commerce/cart/use-update-item'
+import type { HookFetcherContext, MutationHookContext } from '@vercel/commerce/utils/types'
+import { ValidationError } from '@vercel/commerce/utils/errors'
+import useUpdateItem, { UseUpdateItem } from '@vercel/commerce/cart/use-update-item'
 
 import useCart from './use-cart'
 import { handler as removeItemHandler } from './use-remove-item'
 import type { LineItem } from '../types'
 import { checkoutToCart } from '../utils'
 import { getCheckoutId } from '../utils'
-import { Mutation, MutationCheckoutLinesUpdateArgs } from '../schema'
+import { Mutation, MutationCheckoutLinesUpdateArgs } from '../../schema'
 
 import * as mutation from '../utils/mutations'
 
diff --git a/packages/saleor/src/checkout/use-checkout.tsx b/packages/saleor/src/checkout/use-checkout.tsx
index 942f85b83..cab52bb60 100644
--- a/packages/saleor/src/checkout/use-checkout.tsx
+++ b/packages/saleor/src/checkout/use-checkout.tsx
@@ -1,5 +1,5 @@
-import { SWRHook } from '@commerce/utils/types'
-import useCheckout, { UseCheckout } from '@commerce/checkout/use-checkout'
+import { SWRHook } from '@vercel/commerce/utils/types'
+import useCheckout, { UseCheckout } from '@vercel/commerce/checkout/use-checkout'
 
 export default useCheckout as UseCheckout<typeof handler>
 
diff --git a/packages/saleor/src/customer/address/use-add-item.tsx b/packages/saleor/src/customer/address/use-add-item.tsx
index ac9dcd5cf..fabd11b1d 100644
--- a/packages/saleor/src/customer/address/use-add-item.tsx
+++ b/packages/saleor/src/customer/address/use-add-item.tsx
@@ -1,5 +1,5 @@
-import useAddItem, { UseAddItem } from '@commerce/customer/address/use-add-item'
-import { MutationHook } from '@commerce/utils/types'
+import useAddItem, { UseAddItem } from '@vercel/commerce/customer/address/use-add-item'
+import { MutationHook } from '@vercel/commerce/utils/types'
 
 export default useAddItem as UseAddItem<typeof handler>
 
diff --git a/packages/saleor/src/customer/card/use-add-item.tsx b/packages/saleor/src/customer/card/use-add-item.tsx
index 7e3afa9c5..938e6cd61 100644
--- a/packages/saleor/src/customer/card/use-add-item.tsx
+++ b/packages/saleor/src/customer/card/use-add-item.tsx
@@ -1,5 +1,5 @@
-import useAddItem, { UseAddItem } from '@commerce/customer/card/use-add-item'
-import { MutationHook } from '@commerce/utils/types'
+import useAddItem, { UseAddItem } from '@vercel/commerce/customer/card/use-add-item'
+import { MutationHook } from '@vercel/commerce/utils/types'
 
 export default useAddItem as UseAddItem<typeof handler>
 
diff --git a/packages/saleor/src/customer/use-customer.tsx b/packages/saleor/src/customer/use-customer.tsx
index 1e0e63d5a..841793886 100644
--- a/packages/saleor/src/customer/use-customer.tsx
+++ b/packages/saleor/src/customer/use-customer.tsx
@@ -1,6 +1,6 @@
-import useCustomer, { UseCustomer } from '@commerce/customer/use-customer'
-import { CustomerHook } from '@commerce/types/customer'
-import { SWRHook } from '@commerce/utils/types'
+import useCustomer, { UseCustomer } from '@vercel/commerce/customer/use-customer'
+import { CustomerHook } from '@vercel/commerce/types/customer'
+import { SWRHook } from '@vercel/commerce/utils/types'
 
 import * as query from '../utils/queries'
 
diff --git a/packages/saleor/src/fetcher.ts b/packages/saleor/src/fetcher.ts
index 9d3c0bf89..c1be921c5 100644
--- a/packages/saleor/src/fetcher.ts
+++ b/packages/saleor/src/fetcher.ts
@@ -1,4 +1,4 @@
-import { Fetcher } from '@commerce/utils/types'
+import { Fetcher } from '@vercel/commerce/utils/types'
 import { API_URL } from './const'
 import { getToken, handleFetchResponse } from './utils'
 
diff --git a/packages/saleor/src/index.tsx b/packages/saleor/src/index.tsx
index 0fa217943..cf9aaf6e8 100644
--- a/packages/saleor/src/index.tsx
+++ b/packages/saleor/src/index.tsx
@@ -1,4 +1,4 @@
-import { getCommerceProvider, useCommerce as useCoreCommerce } from '@commerce'
+import { getCommerceProvider, useCommerce as useCoreCommerce } from '@vercel/commerce'
 import { saleorProvider, SaleorProvider } from './provider'
 
 export { saleorProvider }
diff --git a/packages/saleor/src/next.config.js b/packages/saleor/src/next.config.cjs
similarity index 100%
rename from packages/saleor/src/next.config.js
rename to packages/saleor/src/next.config.cjs
diff --git a/packages/saleor/src/product/use-price.tsx b/packages/saleor/src/product/use-price.tsx
index 0174faf5e..fd42d7033 100644
--- a/packages/saleor/src/product/use-price.tsx
+++ b/packages/saleor/src/product/use-price.tsx
@@ -1,2 +1,2 @@
-export * from '@commerce/product/use-price'
-export { default } from '@commerce/product/use-price'
+export * from '@vercel/commerce/product/use-price'
+export { default } from '@vercel/commerce/product/use-price'
diff --git a/packages/saleor/src/product/use-search.tsx b/packages/saleor/src/product/use-search.tsx
index cc763c4b7..69212cba1 100644
--- a/packages/saleor/src/product/use-search.tsx
+++ b/packages/saleor/src/product/use-search.tsx
@@ -1,12 +1,12 @@
-import { SWRHook } from '@commerce/utils/types'
-import { Product } from '@commerce/types/product'
-import useSearch, { UseSearch } from '@commerce/product/use-search'
+import { SWRHook } from '@vercel/commerce/utils/types'
+import { Product } from '@vercel/commerce/types/product'
+import useSearch, { UseSearch } from '@vercel/commerce/product/use-search'
 
-import { ProductCountableEdge } from '../schema'
+import { ProductCountableEdge } from '../../schema'
 import { getSearchVariables, normalizeProduct } from '../utils'
 
 import * as query from '../utils/queries'
-import { SearchProductsHook } from '@commerce/types/product'
+import { SearchProductsHook } from '@vercel/commerce/types/product'
 
 export default useSearch as UseSearch<typeof handler>
 
diff --git a/packages/saleor/src/types.ts b/packages/saleor/src/types.ts
index 2025b8898..1bbf94cf3 100644
--- a/packages/saleor/src/types.ts
+++ b/packages/saleor/src/types.ts
@@ -1,5 +1,5 @@
-import type { Cart as CoreCart } from '@commerce/types'
-import { CheckoutLine } from './schema'
+import type { Cart as CoreCart } from '@vercel/commerce/types'
+import { CheckoutLine } from '../schema'
 
 export type SaleorCheckout = {
   id: string
diff --git a/packages/saleor/src/types/cart.ts b/packages/saleor/src/types/cart.ts
index 1f4ba61df..9a4d29387 100644
--- a/packages/saleor/src/types/cart.ts
+++ b/packages/saleor/src/types/cart.ts
@@ -1,6 +1,6 @@
-import * as Core from '@commerce/types/cart'
+import * as Core from '@vercel/commerce/types/cart'
 
-export * from '@commerce/types/cart'
+export * from '@vercel/commerce/types/cart'
 
 export type SaleorCart = {}
 
diff --git a/packages/saleor/src/utils/checkout-attach.ts b/packages/saleor/src/utils/checkout-attach.ts
index 476c73e77..c7ab44ab0 100644
--- a/packages/saleor/src/utils/checkout-attach.ts
+++ b/packages/saleor/src/utils/checkout-attach.ts
@@ -1,5 +1,5 @@
 import * as mutation from './mutations'
-import { CheckoutCustomerAttach } from '../schema'
+import { CheckoutCustomerAttach } from '../../schema'
 
 export const checkoutAttach = async (fetch: any, { variables, headers }: any): Promise<CheckoutCustomerAttach> => {
   const data = await fetch({
diff --git a/packages/saleor/src/utils/checkout-create.ts b/packages/saleor/src/utils/checkout-create.ts
index c1b6e4023..0e86c1335 100644
--- a/packages/saleor/src/utils/checkout-create.ts
+++ b/packages/saleor/src/utils/checkout-create.ts
@@ -1,8 +1,8 @@
 import Cookies from 'js-cookie'
 
 import * as mutation from './mutations'
-import { CheckoutCreate } from '../schema'
-import { CHECKOUT_ID_COOKIE } from '@framework/const'
+import { CheckoutCreate } from '../../schema'
+import { CHECKOUT_ID_COOKIE } from '../const'
 
 export const checkoutCreate = async (fetch: any): Promise<CheckoutCreate> => {
   const data = await fetch({ query: mutation.CheckoutCreate })
diff --git a/packages/saleor/src/utils/checkout-to-cart.ts b/packages/saleor/src/utils/checkout-to-cart.ts
index 0bfcf6ed9..4c228adea 100644
--- a/packages/saleor/src/utils/checkout-to-cart.ts
+++ b/packages/saleor/src/utils/checkout-to-cart.ts
@@ -1,5 +1,5 @@
 import { Cart } from '../types'
-import { CommerceError } from '@commerce/utils/errors'
+import { CommerceError } from '@vercel/commerce/utils/errors'
 
 import {
   CheckoutLinesAdd,
@@ -9,7 +9,7 @@ import {
   Checkout,
   Maybe,
   CheckoutLineDelete,
-} from '../schema'
+} from '../../schema'
 
 import { normalizeCart } from './normalize'
 import throwUserErrors from './throw-user-errors'
diff --git a/packages/saleor/src/utils/get-categories.ts b/packages/saleor/src/utils/get-categories.ts
index 990c0a404..e2cc72533 100644
--- a/packages/saleor/src/utils/get-categories.ts
+++ b/packages/saleor/src/utils/get-categories.ts
@@ -1,6 +1,6 @@
-import { Category } from '@commerce/types/site'
+import { Category } from '@vercel/commerce/types/site'
 import { SaleorConfig } from '../api'
-import { CollectionCountableEdge } from '../schema'
+import { CollectionCountableEdge } from '../../schema'
 import * as query from './queries'
 
 const getCategories = async (config: SaleorConfig): Promise<Category[]> => {
diff --git a/packages/saleor/src/utils/handle-fetch-response.ts b/packages/saleor/src/utils/handle-fetch-response.ts
index 6a2b5f57b..33fe15c17 100644
--- a/packages/saleor/src/utils/handle-fetch-response.ts
+++ b/packages/saleor/src/utils/handle-fetch-response.ts
@@ -1,4 +1,4 @@
-import { FetcherError } from '@commerce/utils/errors'
+import { FetcherError } from '@vercel/commerce/utils/errors'
 
 export function getError(errors: any[], status: number) {
   errors = errors ?? [{ message: 'Failed to fetch Saleor API' }]
diff --git a/packages/saleor/src/utils/handle-login.ts b/packages/saleor/src/utils/handle-login.ts
index 4ef390174..b1beaeda9 100644
--- a/packages/saleor/src/utils/handle-login.ts
+++ b/packages/saleor/src/utils/handle-login.ts
@@ -1,5 +1,5 @@
-import { FetcherOptions } from '@commerce/utils/types'
-import { CreateToken, Mutation, MutationTokenCreateArgs } from '../schema'
+import { FetcherOptions } from '@vercel/commerce/utils/types'
+import { CreateToken, Mutation, MutationTokenCreateArgs } from '../../schema'
 import { setToken, setCSRFToken } from './customer-token'
 import * as mutation from './mutations'
 import throwUserErrors from './throw-user-errors'
diff --git a/packages/saleor/src/utils/normalize.ts b/packages/saleor/src/utils/normalize.ts
index 56091db15..a4ff4b52c 100644
--- a/packages/saleor/src/utils/normalize.ts
+++ b/packages/saleor/src/utils/normalize.ts
@@ -1,6 +1,6 @@
-import { Product } from '@commerce/types/product'
+import { Product } from '@vercel/commerce/types/product'
 
-import { Product as SaleorProduct, Checkout, CheckoutLine, Money, ProductVariant } from '../schema'
+import { Product as SaleorProduct, Checkout, CheckoutLine, Money, ProductVariant } from '../../schema'
 
 import type { Cart, LineItem } from '../types'
 
diff --git a/packages/saleor/src/utils/throw-user-errors.ts b/packages/saleor/src/utils/throw-user-errors.ts
index 2991d78a6..59345e748 100644
--- a/packages/saleor/src/utils/throw-user-errors.ts
+++ b/packages/saleor/src/utils/throw-user-errors.ts
@@ -1,6 +1,6 @@
-import { ValidationError } from '@commerce/utils/errors'
+import { ValidationError } from '@vercel/commerce/utils/errors'
 
-import { CheckoutError, CheckoutErrorCode, AppError, AccountError, AccountErrorCode } from '../schema'
+import { CheckoutError, CheckoutErrorCode, AppError, AccountError, AccountErrorCode } from '../../schema'
 
 export type UserErrors = Array<CheckoutError | AccountError | AppError>
 
diff --git a/packages/saleor/src/wishlist/use-wishlist.tsx b/packages/saleor/src/wishlist/use-wishlist.tsx
index cdd9a643d..56e7ea0e7 100644
--- a/packages/saleor/src/wishlist/use-wishlist.tsx
+++ b/packages/saleor/src/wishlist/use-wishlist.tsx
@@ -1,8 +1,8 @@
 // TODO: replace this hook and other wishlist hooks with a handler, or remove them if
 // Saleor doesn't have a wishlist
 
-import { HookFetcher } from '@commerce/utils/types'
-import { Product } from '../schema'
+import { HookFetcher } from '@vercel/commerce/utils/types'
+import { Product } from '../../schema'
 
 const defaultOpts = {}
 
diff --git a/packages/saleor/tsconfig.json b/packages/saleor/tsconfig.json
new file mode 100644
index 000000000..81ac7f650
--- /dev/null
+++ b/packages/saleor/tsconfig.json
@@ -0,0 +1,22 @@
+{
+  "compilerOptions": {
+    "target": "esnext",
+    "module": "esnext",
+    "outDir": "dist",
+    "baseUrl": "src",
+    "lib": ["dom", "dom.iterable", "esnext"],
+    "declaration": true,
+    "allowJs": true,
+    "skipLibCheck": true,
+    "strict": true,
+    "forceConsistentCasingInFileNames": true,
+    "esModuleInterop": true,
+    "moduleResolution": "node",
+    "resolveJsonModule": true,
+    "isolatedModules": true,
+    "pretty": true,
+    "jsx": "react-jsx"
+  },
+  "include": ["src"],
+  "exclude": ["node_modules", "dist"]
+}