From 323435b98a6343dc9f40c48b1b60f3a47e9c0d2b Mon Sep 17 00:00:00 2001
From: LFades <luis@vercel.com>
Date: Fri, 14 Jan 2022 15:39:46 -0500
Subject: [PATCH] Fixed imports and other things

---
 packages/kibocommerce/package.json                 |  3 ++-
 .../src/api/endpoints/cart/add-item.ts             |  1 -
 .../src/api/endpoints/cart/get-cart.ts             |  2 +-
 .../kibocommerce/src/api/endpoints/cart/index.ts   |  4 ++--
 .../src/api/endpoints/catalog/products/index.ts    |  4 ++--
 .../src/api/endpoints/catalog/products/products.ts |  2 +-
 .../src/api/endpoints/customer/index.ts            |  4 ++--
 .../kibocommerce/src/api/endpoints/login/index.ts  |  4 ++--
 .../kibocommerce/src/api/endpoints/login/login.ts  | 14 +++++++-------
 .../kibocommerce/src/api/endpoints/logout/index.ts |  4 ++--
 .../kibocommerce/src/api/endpoints/signup/index.ts |  4 ++--
 .../src/api/endpoints/signup/signup.ts             | 12 ++++++------
 .../src/api/endpoints/wishlist/index.ts            |  4 ++--
 packages/kibocommerce/src/api/index.ts             |  4 ++--
 .../src/api/operations/get-all-pages.ts            |  6 +++---
 .../src/api/operations/get-all-products.ts         |  8 ++++----
 .../src/api/operations/get-customer-wishlist.ts    |  6 +++---
 .../kibocommerce/src/api/operations/get-page.ts    |  6 +++---
 .../kibocommerce/src/api/operations/get-product.ts | 12 ++++++------
 .../src/api/operations/get-site-info.ts            |  4 ++--
 .../src/api/utils/fetch-graphql-api.ts             |  4 ++--
 packages/kibocommerce/src/api/utils/fetch-local.ts |  4 ++--
 packages/kibocommerce/src/auth/use-login.tsx       |  6 +++---
 packages/kibocommerce/src/auth/use-logout.tsx      |  6 +++---
 packages/kibocommerce/src/auth/use-signup.tsx      |  6 +++---
 packages/kibocommerce/src/cart/use-add-item.tsx    |  8 ++++----
 packages/kibocommerce/src/cart/use-cart.tsx        |  4 ++--
 packages/kibocommerce/src/cart/use-remove-item.tsx |  8 ++++----
 packages/kibocommerce/src/cart/use-update-item.tsx |  8 ++++----
 .../kibocommerce/src/checkout/use-checkout.tsx     |  6 +++---
 .../src/customer/address/use-add-item.tsx          |  6 +++---
 .../src/customer/card/use-add-item.tsx             |  6 +++---
 .../kibocommerce/src/customer/use-customer.tsx     |  4 ++--
 packages/kibocommerce/src/fetcher.ts               |  4 ++--
 packages/kibocommerce/src/index.tsx                |  2 +-
 packages/kibocommerce/src/lib/normalize.ts         |  2 +-
 .../src/{next.config.js => next.config.cjs}        |  0
 packages/kibocommerce/src/product/use-price.tsx    |  4 ++--
 packages/kibocommerce/src/product/use-search.tsx   |  4 ++--
 packages/kibocommerce/src/types/customer.ts        |  4 ++--
 packages/kibocommerce/src/types/login.ts           |  6 +++---
 packages/kibocommerce/src/types/logout.ts          |  2 +-
 packages/kibocommerce/src/types/page.ts            |  4 ++--
 packages/kibocommerce/src/types/signup.ts          |  2 +-
 .../kibocommerce/src/wishlist/use-add-item.tsx     |  8 ++++----
 .../kibocommerce/src/wishlist/use-remove-item.tsx  |  8 ++++----
 .../kibocommerce/src/wishlist/use-wishlist.tsx     |  6 +++---
 47 files changed, 120 insertions(+), 120 deletions(-)
 rename packages/kibocommerce/src/{next.config.js => next.config.cjs} (100%)

diff --git a/packages/kibocommerce/package.json b/packages/kibocommerce/package.json
index c7c079db7..8abff801d 100644
--- a/packages/kibocommerce/package.json
+++ b/packages/kibocommerce/package.json
@@ -29,7 +29,8 @@
     }
   },
   "files": [
-    "dist"
+    "dist",
+    "schema.d.ts"
   ],
   "publishConfig": {
     "typesVersions": {
diff --git a/packages/kibocommerce/src/api/endpoints/cart/add-item.ts b/packages/kibocommerce/src/api/endpoints/cart/add-item.ts
index 6cda2a944..6dfea1e0c 100644
--- a/packages/kibocommerce/src/api/endpoints/cart/add-item.ts
+++ b/packages/kibocommerce/src/api/endpoints/cart/add-item.ts
@@ -1,4 +1,3 @@
-import { Product } from './../../../schema.d'
 import { normalizeCart } from '../../../lib/normalize'
 import type { CartEndpoint } from '.'
 import addToCurrentCartMutation from '../../../api/mutations/addToCart-mutation'
diff --git a/packages/kibocommerce/src/api/endpoints/cart/get-cart.ts b/packages/kibocommerce/src/api/endpoints/cart/get-cart.ts
index b7e672092..6a6ec3ab4 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/endpoints/cart/index.ts b/packages/kibocommerce/src/api/endpoints/cart/index.ts
index 53de2424e..d4e8118ac 100644
--- a/packages/kibocommerce/src/api/endpoints/cart/index.ts
+++ b/packages/kibocommerce/src/api/endpoints/cart/index.ts
@@ -1,5 +1,5 @@
-import { GetAPISchema, createEndpoint } from '@commerce/api'
-import cartEndpoint from '@commerce/api/endpoints/cart'
+import { GetAPISchema, createEndpoint } from '@vercel/commerce/api'
+import cartEndpoint from '@vercel/commerce/api/endpoints/cart'
 import type { KiboCommerceAPI } from '../..'
 import getCart from './get-cart';
 import addItem from './add-item';
diff --git a/packages/kibocommerce/src/api/endpoints/catalog/products/index.ts b/packages/kibocommerce/src/api/endpoints/catalog/products/index.ts
index 12c72b27e..a838eb56e 100644
--- a/packages/kibocommerce/src/api/endpoints/catalog/products/index.ts
+++ b/packages/kibocommerce/src/api/endpoints/catalog/products/index.ts
@@ -1,5 +1,5 @@
-import { GetAPISchema, createEndpoint } from '@commerce/api'
-import productsEndpoint from '@commerce/api/endpoints/catalog/products'
+import { GetAPISchema, createEndpoint } from '@vercel/commerce/api'
+import productsEndpoint from '@vercel/commerce/api/endpoints/catalog/products'
 import type { KiboCommerceAPI } from '../../..'
 import getProducts from '../products/products'
 
diff --git a/packages/kibocommerce/src/api/endpoints/catalog/products/products.ts b/packages/kibocommerce/src/api/endpoints/catalog/products/products.ts
index a4f5e6dac..189922d53 100644
--- a/packages/kibocommerce/src/api/endpoints/catalog/products/products.ts
+++ b/packages/kibocommerce/src/api/endpoints/catalog/products/products.ts
@@ -1,4 +1,4 @@
-import { Product } from '@commerce/types/product'
+import { Product } from '@vercel/commerce/types/product'
 import { ProductsEndpoint } from '.'
 import productSearchQuery from '../../../queries/product-search-query'
 import { buildProductSearchVars } from '../../../../lib/product-search-vars'
diff --git a/packages/kibocommerce/src/api/endpoints/customer/index.ts b/packages/kibocommerce/src/api/endpoints/customer/index.ts
index c32bcfa91..20bd44da9 100644
--- a/packages/kibocommerce/src/api/endpoints/customer/index.ts
+++ b/packages/kibocommerce/src/api/endpoints/customer/index.ts
@@ -1,5 +1,5 @@
-import { GetAPISchema, createEndpoint } from '@commerce/api'
-import customerEndpoint from '@commerce/api/endpoints/customer'
+import { GetAPISchema, createEndpoint } from '@vercel/commerce/api'
+import customerEndpoint from '@vercel/commerce/api/endpoints/customer'
 import type { CustomerSchema } from '../../../types/customer'
 import type { KiboCommerceAPI } from '../..'
 import getLoggedInCustomer from './customer'
diff --git a/packages/kibocommerce/src/api/endpoints/login/index.ts b/packages/kibocommerce/src/api/endpoints/login/index.ts
index f76e0f644..679a92d90 100644
--- a/packages/kibocommerce/src/api/endpoints/login/index.ts
+++ b/packages/kibocommerce/src/api/endpoints/login/index.ts
@@ -1,5 +1,5 @@
-import { GetAPISchema, createEndpoint } from '@commerce/api'
-import loginEndpoint from '@commerce/api/endpoints/login'
+import { GetAPISchema, createEndpoint } from '@vercel/commerce/api'
+import loginEndpoint from '@vercel/commerce/api/endpoints/login'
 import type { LoginSchema } from '../../../types/login'
 import type { KiboCommerceAPI } from '../..'
 import login from './login'
diff --git a/packages/kibocommerce/src/api/endpoints/login/login.ts b/packages/kibocommerce/src/api/endpoints/login/login.ts
index 84410a281..7a08069c6 100644
--- a/packages/kibocommerce/src/api/endpoints/login/login.ts
+++ b/packages/kibocommerce/src/api/endpoints/login/login.ts
@@ -1,4 +1,4 @@
-import { FetcherError } from '@commerce/utils/errors'
+import { FetcherError } from '@vercel/commerce/utils/errors'
 import type { LoginEndpoint } from '.'
 import { loginMutation } from '../../mutations/login-mutation'
 import { prepareSetCookie } from '../../../lib/prepare-set-cookie';
@@ -14,7 +14,7 @@ const login: LoginEndpoint['handlers']['login'] = async ({
   config,
   commerce,
 }) => {
-  
+
   if (!(email && password)) {
     return res.status(400).json({
       data: null,
@@ -28,17 +28,17 @@ const login: LoginEndpoint['handlers']['login'] = async ({
     const variables = { loginInput : { username: email, password }};
     response = await  config.fetch(loginMutation, { variables })
     const { account: token }  = response.data;
-    
+
     // Set Cookie
     const cookieExpirationDate = getCookieExpirationDate(config.customerCookieMaxAgeInDays)
-    
+
     const authCookie = prepareSetCookie(
       config.customerCookie,
       JSON.stringify(token),
       token.accessTokenExpiration ? { expires: cookieExpirationDate }: {},
     )
-    setCookies(res, [authCookie])   
-   
+    setCookies(res, [authCookie])
+
   } catch (error) {
     // Check if the email and password didn't match an existing account
     if (
@@ -63,4 +63,4 @@ const login: LoginEndpoint['handlers']['login'] = async ({
   res.status(200).json({ data: response })
 }
 
-export default login
\ No newline at end of file
+export default login
diff --git a/packages/kibocommerce/src/api/endpoints/logout/index.ts b/packages/kibocommerce/src/api/endpoints/logout/index.ts
index ec4ded011..00804afb3 100644
--- a/packages/kibocommerce/src/api/endpoints/logout/index.ts
+++ b/packages/kibocommerce/src/api/endpoints/logout/index.ts
@@ -1,5 +1,5 @@
-import { GetAPISchema, createEndpoint } from '@commerce/api'
-import logoutEndpoint from '@commerce/api/endpoints/logout'
+import { GetAPISchema, createEndpoint } from '@vercel/commerce/api'
+import logoutEndpoint from '@vercel/commerce/api/endpoints/logout'
 import type { LogoutSchema } from '../../../types/logout'
 import type { KiboCommerceAPI } from '../..'
 import logout from './logout'
diff --git a/packages/kibocommerce/src/api/endpoints/signup/index.ts b/packages/kibocommerce/src/api/endpoints/signup/index.ts
index 3eda94d06..8b2fec006 100644
--- a/packages/kibocommerce/src/api/endpoints/signup/index.ts
+++ b/packages/kibocommerce/src/api/endpoints/signup/index.ts
@@ -1,5 +1,5 @@
-import { GetAPISchema, createEndpoint } from '@commerce/api'
-import signupEndpoint from '@commerce/api/endpoints/signup'
+import { GetAPISchema, createEndpoint } from '@vercel/commerce/api'
+import signupEndpoint from '@vercel/commerce/api/endpoints/signup'
 import type { SignupSchema } from '../../../types/signup'
 import type { KiboCommerceAPI } from '../..'
 import signup from './signup'
diff --git a/packages/kibocommerce/src/api/endpoints/signup/signup.ts b/packages/kibocommerce/src/api/endpoints/signup/signup.ts
index 77790ca3a..b3d988475 100644
--- a/packages/kibocommerce/src/api/endpoints/signup/signup.ts
+++ b/packages/kibocommerce/src/api/endpoints/signup/signup.ts
@@ -1,4 +1,4 @@
-import { FetcherError } from '@commerce/utils/errors'
+import { FetcherError } from '@vercel/commerce/utils/errors'
 import type { SignupEndpoint } from '.'
 import { registerUserMutation, registerUserLoginMutation } from '../../mutations/signup-mutation'
 import { prepareSetCookie } from '../../../lib/prepare-set-cookie';
@@ -14,7 +14,7 @@ const signup: SignupEndpoint['handlers']['signup'] = async ({
   config,
   commerce,
 }) => {
-  
+
   if (!(email && password)) {
     return res.status(400).json({
       data: null,
@@ -35,7 +35,7 @@ const signup: SignupEndpoint['handlers']['signup'] = async ({
           id: 0
         }
     }
-    
+
     const registerUserResponse = await  config.fetch(registerUserMutation, { variables: registerUserVariables})
     const accountId  = registerUserResponse.data?.account?.id;
 
@@ -52,7 +52,7 @@ const signup: SignupEndpoint['handlers']['signup'] = async ({
 
     response = await  config.fetch(registerUserLoginMutation, { variables: registerUserLoginVairables})
     const { account: token }  = response.data;
-  
+
     // Set Cookie
     const cookieExpirationDate = getCookieExpirationDate(config.customerCookieMaxAgeInDays)
 
@@ -62,7 +62,7 @@ const signup: SignupEndpoint['handlers']['signup'] = async ({
       token.accessTokenExpiration ? { expires: cookieExpirationDate }: {},
     )
 
-    setCookies(res, [authCookie])   
+    setCookies(res, [authCookie])
 
   } catch (error) {
     // Check if the email and password didn't match an existing account
@@ -88,4 +88,4 @@ const signup: SignupEndpoint['handlers']['signup'] = async ({
   res.status(200).json({ data: response })
 }
 
-export default signup
\ No newline at end of file
+export default signup
diff --git a/packages/kibocommerce/src/api/endpoints/wishlist/index.ts b/packages/kibocommerce/src/api/endpoints/wishlist/index.ts
index 052cdcef6..58344be72 100644
--- a/packages/kibocommerce/src/api/endpoints/wishlist/index.ts
+++ b/packages/kibocommerce/src/api/endpoints/wishlist/index.ts
@@ -1,5 +1,5 @@
-import { GetAPISchema, createEndpoint } from '@commerce/api'
-import wishlistEndpoint from '@commerce/api/endpoints/wishlist'
+import { GetAPISchema, createEndpoint } from '@vercel/commerce/api'
+import wishlistEndpoint from '@vercel/commerce/api/endpoints/wishlist'
 import type { KiboCommerceAPI } from '../..'
 import getWishlist from './get-wishlist'
 import addItem from './add-item'
diff --git a/packages/kibocommerce/src/api/index.ts b/packages/kibocommerce/src/api/index.ts
index a79745c57..aa6d9604e 100644
--- a/packages/kibocommerce/src/api/index.ts
+++ b/packages/kibocommerce/src/api/index.ts
@@ -1,5 +1,5 @@
-import type { CommerceAPI, CommerceAPIConfig } from '@commerce/api'
-import { getCommerceApi as commerceApi } from '@commerce/api'
+import type { CommerceAPI, CommerceAPIConfig } from '@vercel/commerce/api'
+import { getCommerceApi as commerceApi } from '@vercel/commerce/api'
 import createFetchGraphqlApi from './utils/fetch-graphql-api'
 
 import getAllPages from './operations/get-all-pages'
diff --git a/packages/kibocommerce/src/api/operations/get-all-pages.ts b/packages/kibocommerce/src/api/operations/get-all-pages.ts
index 6bc0e4a8c..7607e194e 100644
--- a/packages/kibocommerce/src/api/operations/get-all-pages.ts
+++ b/packages/kibocommerce/src/api/operations/get-all-pages.ts
@@ -1,4 +1,4 @@
-import type { OperationContext } from '@commerce/api/operations'
+import type { OperationContext } from '@vercel/commerce/api/operations'
 import type { KiboCommerceConfig } from '../index'
 import { getAllPagesQuery } from '../queries/get-all-pages-query'
 import { GetPagesQueryParams } from "../../types/page";
@@ -30,9 +30,9 @@ export default function getAllPagesOperation({
     const { data } = await cfg.fetch(query, { variables });
 
     const pages = data.documentListDocuments.items.map(normalizePage);
-    
+
     return { pages }
   }
 
   return getAllPages
-}
\ No newline at end of file
+}
diff --git a/packages/kibocommerce/src/api/operations/get-all-products.ts b/packages/kibocommerce/src/api/operations/get-all-products.ts
index c60b88f4e..bddafbffa 100644
--- a/packages/kibocommerce/src/api/operations/get-all-products.ts
+++ b/packages/kibocommerce/src/api/operations/get-all-products.ts
@@ -1,6 +1,6 @@
-import { Product } from '@commerce/types/product'
-import { GetAllProductsOperation } from '@commerce/types/product'
-import type { OperationContext } from '@commerce/api/operations'
+import { Product } from '@vercel/commerce/types/product'
+import { GetAllProductsOperation } from '@vercel/commerce/types/product'
+import type { OperationContext } from '@vercel/commerce/api/operations'
 import type { KiboCommerceConfig } from '../index'
 import { getAllProductsQuery } from '../queries/get-all-products-query';
 import { normalizeProduct } from '../../lib/normalize'
@@ -23,7 +23,7 @@ export default function getAllProductsOperation({
     const { data } = await cfg.fetch(query);
 
     let normalizedProducts =  data.products.items ? data.products.items.map( (item:any) => normalizeProduct(item, cfg)) : [];
-   
+
     return {
       products: normalizedProducts,
     }
diff --git a/packages/kibocommerce/src/api/operations/get-customer-wishlist.ts b/packages/kibocommerce/src/api/operations/get-customer-wishlist.ts
index a2a60e9ae..c2792ad32 100644
--- a/packages/kibocommerce/src/api/operations/get-customer-wishlist.ts
+++ b/packages/kibocommerce/src/api/operations/get-customer-wishlist.ts
@@ -1,11 +1,11 @@
 import type {
   OperationContext,
   OperationOptions,
-} from '@commerce/api/operations'
+} from '@vercel/commerce/api/operations'
 import type {
   GetCustomerWishlistOperation,
   Wishlist,
-} from '@commerce/types/wishlist'
+} from '@vercel/commerce/types/wishlist'
 // import type { RecursivePartial, RecursiveRequired } from '../utils/types'
 import { KiboCommerceConfig } from '..'
 // import getAllProducts, { ProductEdge } from './get-all-products'
@@ -42,7 +42,7 @@ export default function getCustomerWishlistOperation({
   }): Promise<T['data']> {
     let customerWishlist ={}
     try {
-      
+
       config = commerce.getConfig(config)
       const result= await config?.fetch(getCustomerWishlistQuery,{variables})
       customerWishlist= result?.data?.customerWishlist;
diff --git a/packages/kibocommerce/src/api/operations/get-page.ts b/packages/kibocommerce/src/api/operations/get-page.ts
index 8cfccb7db..69289cba0 100644
--- a/packages/kibocommerce/src/api/operations/get-page.ts
+++ b/packages/kibocommerce/src/api/operations/get-page.ts
@@ -1,11 +1,11 @@
 import type {
   OperationContext,
-} from '@commerce/api/operations'
+} from '@vercel/commerce/api/operations'
 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,
@@ -37,4 +37,4 @@ export default function getPageOperation({
   }
 
   return getPage
-}
\ No newline at end of file
+}
diff --git a/packages/kibocommerce/src/api/operations/get-product.ts b/packages/kibocommerce/src/api/operations/get-product.ts
index a3acf44d9..c41b1bf04 100644
--- a/packages/kibocommerce/src/api/operations/get-product.ts
+++ b/packages/kibocommerce/src/api/operations/get-product.ts
@@ -1,7 +1,7 @@
 import type { KiboCommerceConfig } from '../index'
-import { Product } from '@commerce/types/product'
-import { GetProductOperation } from '@commerce/types/product'
-import type { OperationContext } from '@commerce/api/operations'
+import { Product } from '@vercel/commerce/types/product'
+import { GetProductOperation } from '@vercel/commerce/types/product'
+import type { OperationContext } from '@vercel/commerce/api/operations'
 import { getProductQuery } from '../queries/get-product-query'
 import { normalizeProduct } from '../../lib/normalize'
 
@@ -20,14 +20,14 @@ export default function getProductOperation({
     preview?: boolean
   } = {}): Promise<Product | {} | any> {
     const productVariables = { productCode: variables?.slug}
-  
+
     const cfg = commerce.getConfig(config)
     const { data } = await cfg.fetch(query, { variables: productVariables });
 
     const normalizedProduct = normalizeProduct(data.product, cfg)
-   
+
     return {
-      product: normalizedProduct 
+      product: normalizedProduct
     }
   }
 
diff --git a/packages/kibocommerce/src/api/operations/get-site-info.ts b/packages/kibocommerce/src/api/operations/get-site-info.ts
index 1bd0ddf63..6b72d3b47 100644
--- a/packages/kibocommerce/src/api/operations/get-site-info.ts
+++ b/packages/kibocommerce/src/api/operations/get-site-info.ts
@@ -1,5 +1,5 @@
-import { OperationContext } from '@commerce/api/operations'
-import { Category } from '@commerce/types/site'
+import { OperationContext } from '@vercel/commerce/api/operations'
+import { Category } from '@vercel/commerce/types/site'
 import { KiboCommerceConfig } from '../index'
 import {categoryTreeQuery} from '../queries/get-categories-tree-query'
 import { normalizeCategory } from '../../lib/normalize'
diff --git a/packages/kibocommerce/src/api/utils/fetch-graphql-api.ts b/packages/kibocommerce/src/api/utils/fetch-graphql-api.ts
index 8638b35b7..cf84f5e41 100644
--- a/packages/kibocommerce/src/api/utils/fetch-graphql-api.ts
+++ b/packages/kibocommerce/src/api/utils/fetch-graphql-api.ts
@@ -1,5 +1,5 @@
-import { FetcherError } from '@commerce/utils/errors'
-import type { GraphQLFetcher } from '@commerce/api'
+import { FetcherError } from '@vercel/commerce/utils/errors'
+import type { GraphQLFetcher } from '@vercel/commerce/api'
 import type { KiboCommerceConfig } from '../index'
 import fetch from './fetch'
 import { APIAuthenticationHelper } from './api-auth-helper';
diff --git a/packages/kibocommerce/src/api/utils/fetch-local.ts b/packages/kibocommerce/src/api/utils/fetch-local.ts
index 2612188a9..fa3a214cb 100644
--- a/packages/kibocommerce/src/api/utils/fetch-local.ts
+++ b/packages/kibocommerce/src/api/utils/fetch-local.ts
@@ -1,5 +1,5 @@
-import { FetcherError } from '@commerce/utils/errors'
-import type { GraphQLFetcher } from '@commerce/api'
+import { FetcherError } from '@vercel/commerce/utils/errors'
+import type { GraphQLFetcher } from '@vercel/commerce/api'
 import type { KiboCommerceConfig } from '../index'
 import fetch from './fetch'
 
diff --git a/packages/kibocommerce/src/auth/use-login.tsx b/packages/kibocommerce/src/auth/use-login.tsx
index 672263f7c..85913781d 100644
--- a/packages/kibocommerce/src/auth/use-login.tsx
+++ b/packages/kibocommerce/src/auth/use-login.tsx
@@ -1,8 +1,8 @@
-import { MutationHook } from '@commerce/utils/types'
-import useLogin, { UseLogin } from '@commerce/auth/use-login'
+import { MutationHook } from '@vercel/commerce/utils/types'
+import useLogin, { UseLogin } from '@vercel/commerce/auth/use-login'
 
 import { useCallback } from 'react'
-import { CommerceError } from '@commerce/utils/errors'
+import { CommerceError } from '@vercel/commerce/utils/errors'
 import type { LoginHook } from '../types/login'
 import useCustomer from '../customer/use-customer'
 import useCart from '../cart/use-cart'
diff --git a/packages/kibocommerce/src/auth/use-logout.tsx b/packages/kibocommerce/src/auth/use-logout.tsx
index 3e344fb09..83e5a4b0c 100644
--- a/packages/kibocommerce/src/auth/use-logout.tsx
+++ b/packages/kibocommerce/src/auth/use-logout.tsx
@@ -1,6 +1,6 @@
 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 type { LogoutHook } from '../types/logout'
 import useCustomer from '../customer/use-customer'
 import useCart from '../cart/use-cart'
@@ -14,7 +14,7 @@ export const handler: MutationHook<LogoutHook> = {
   },
   useHook: ({ fetch }) => () => {
     const { mutate } = useCustomer()
-    const { mutate: mutateCart } = useCart() 
+    const { mutate: mutateCart } = useCart()
 
     return useCallback(
       async function logout() {
diff --git a/packages/kibocommerce/src/auth/use-signup.tsx b/packages/kibocommerce/src/auth/use-signup.tsx
index da06fd3eb..f6ed8c5b3 100644
--- a/packages/kibocommerce/src/auth/use-signup.tsx
+++ b/packages/kibocommerce/src/auth/use-signup.tsx
@@ -1,7 +1,7 @@
 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 type { SignupHook } from '../types/signup'
 import useCustomer from '../customer/use-customer'
 
diff --git a/packages/kibocommerce/src/cart/use-add-item.tsx b/packages/kibocommerce/src/cart/use-add-item.tsx
index 1ac6ac6f8..bb7b8befc 100644
--- a/packages/kibocommerce/src/cart/use-add-item.tsx
+++ b/packages/kibocommerce/src/cart/use-add-item.tsx
@@ -1,8 +1,8 @@
 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 { AddItemHook } from '@commerce/types/cart'
+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 type { AddItemHook } from '@vercel/commerce/types/cart'
 import useCart from './use-cart'
 
 export default useAddItem as UseAddItem<typeof handler>
diff --git a/packages/kibocommerce/src/cart/use-cart.tsx b/packages/kibocommerce/src/cart/use-cart.tsx
index 0c565e094..0af0738ec 100644
--- a/packages/kibocommerce/src/cart/use-cart.tsx
+++ b/packages/kibocommerce/src/cart/use-cart.tsx
@@ -1,6 +1,6 @@
 import { useMemo } from 'react'
-import { SWRHook } from '@commerce/utils/types'
-import useCart, { UseCart } from '@commerce/cart/use-cart'
+import { SWRHook } from '@vercel/commerce/utils/types'
+import useCart, { UseCart } from '@vercel/commerce/cart/use-cart'
 
 export default useCart as UseCart<typeof handler>
 
diff --git a/packages/kibocommerce/src/cart/use-remove-item.tsx b/packages/kibocommerce/src/cart/use-remove-item.tsx
index 1376f29ce..3fa883c2f 100644
--- a/packages/kibocommerce/src/cart/use-remove-item.tsx
+++ b/packages/kibocommerce/src/cart/use-remove-item.tsx
@@ -2,10 +2,10 @@ import { useCallback } from 'react'
 import type {
   MutationHookContext,
   HookFetcherContext,
-} from '@commerce/utils/types'
-import { ValidationError } from '@commerce/utils/errors'
-import useRemoveItem, { UseRemoveItem } from '@commerce/cart/use-remove-item'
-import type { Cart, LineItem, RemoveItemHook } from '@commerce/types/cart'
+} from '@vercel/commerce/utils/types'
+import { ValidationError } from '@vercel/commerce/utils/errors'
+import useRemoveItem, { UseRemoveItem } from '@vercel/commerce/cart/use-remove-item'
+import type { Cart, LineItem, RemoveItemHook } from '@vercel/commerce/types/cart'
 import useCart from './use-cart'
 
 export type RemoveItemFn<T = any> = T extends LineItem
diff --git a/packages/kibocommerce/src/cart/use-update-item.tsx b/packages/kibocommerce/src/cart/use-update-item.tsx
index 0f9f5754d..931782c4f 100644
--- a/packages/kibocommerce/src/cart/use-update-item.tsx
+++ b/packages/kibocommerce/src/cart/use-update-item.tsx
@@ -3,10 +3,10 @@ import debounce from 'lodash.debounce'
 import type {
   MutationHookContext,
   HookFetcherContext,
-} from '@commerce/utils/types'
-import { ValidationError } from '@commerce/utils/errors'
-import useUpdateItem, { UseUpdateItem } from '@commerce/cart/use-update-item'
-import type { LineItem, UpdateItemHook } from '@commerce/types/cart'
+} from '@vercel/commerce/utils/types'
+import { ValidationError } from '@vercel/commerce/utils/errors'
+import useUpdateItem, { UseUpdateItem } from '@vercel/commerce/cart/use-update-item'
+import type { LineItem, UpdateItemHook } from '@vercel/commerce/types/cart'
 import { handler as removeItemHandler } from './use-remove-item'
 import useCart from './use-cart'
 
diff --git a/packages/kibocommerce/src/checkout/use-checkout.tsx b/packages/kibocommerce/src/checkout/use-checkout.tsx
index 8ba12c14a..cab52bb60 100644
--- a/packages/kibocommerce/src/checkout/use-checkout.tsx
+++ b/packages/kibocommerce/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>
 
@@ -11,4 +11,4 @@ export const handler: SWRHook<any> = {
   useHook:
     ({ useData }) =>
     async (input) => ({}),
-}
\ No newline at end of file
+}
diff --git a/packages/kibocommerce/src/customer/address/use-add-item.tsx b/packages/kibocommerce/src/customer/address/use-add-item.tsx
index 70bd044b2..fabd11b1d 100644
--- a/packages/kibocommerce/src/customer/address/use-add-item.tsx
+++ b/packages/kibocommerce/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>
 
@@ -12,4 +12,4 @@ export const handler: MutationHook<any> = {
     ({ fetch }) =>
     () =>
     async () => ({}),
-}
\ No newline at end of file
+}
diff --git a/packages/kibocommerce/src/customer/card/use-add-item.tsx b/packages/kibocommerce/src/customer/card/use-add-item.tsx
index d6bd0d77f..938e6cd61 100644
--- a/packages/kibocommerce/src/customer/card/use-add-item.tsx
+++ b/packages/kibocommerce/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>
 
@@ -12,4 +12,4 @@ export const handler: MutationHook<any> = {
     ({ fetch }) =>
     () =>
     async () => ({}),
-}
\ No newline at end of file
+}
diff --git a/packages/kibocommerce/src/customer/use-customer.tsx b/packages/kibocommerce/src/customer/use-customer.tsx
index 238b1229b..73e804a4b 100644
--- a/packages/kibocommerce/src/customer/use-customer.tsx
+++ b/packages/kibocommerce/src/customer/use-customer.tsx
@@ -1,5 +1,5 @@
-import { SWRHook } from '@commerce/utils/types'
-import useCustomer, { UseCustomer } from '@commerce/customer/use-customer'
+import { SWRHook } from '@vercel/commerce/utils/types'
+import useCustomer, { UseCustomer } from '@vercel/commerce/customer/use-customer'
 import type { CustomerHook } from '../types/customer'
 
 export default useCustomer as UseCustomer<typeof handler>
diff --git a/packages/kibocommerce/src/fetcher.ts b/packages/kibocommerce/src/fetcher.ts
index f8ca0c578..bc8a6b9aa 100644
--- a/packages/kibocommerce/src/fetcher.ts
+++ b/packages/kibocommerce/src/fetcher.ts
@@ -1,5 +1,5 @@
-import { FetcherError } from '@commerce/utils/errors'
-import type { Fetcher } from '@commerce/utils/types'
+import { FetcherError } from '@vercel/commerce/utils/errors'
+import type { Fetcher } from '@vercel/commerce/utils/types'
 
 async function getText(res: Response) {
   try {
diff --git a/packages/kibocommerce/src/index.tsx b/packages/kibocommerce/src/index.tsx
index af8b66ee6..43077a535 100644
--- a/packages/kibocommerce/src/index.tsx
+++ b/packages/kibocommerce/src/index.tsx
@@ -1,4 +1,4 @@
-import { getCommerceProvider, useCommerce as useCoreCommerce } from '@commerce'
+import { getCommerceProvider, useCommerce as useCoreCommerce } from '@vercel/commerce'
 import { kiboCommerceProvider, KibocommerceProvider } from './provider'
 
 export { kiboCommerceProvider }
diff --git a/packages/kibocommerce/src/lib/normalize.ts b/packages/kibocommerce/src/lib/normalize.ts
index 5fd03b855..00d0a44c7 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/next.config.js b/packages/kibocommerce/src/next.config.cjs
similarity index 100%
rename from packages/kibocommerce/src/next.config.js
rename to packages/kibocommerce/src/next.config.cjs
diff --git a/packages/kibocommerce/src/product/use-price.tsx b/packages/kibocommerce/src/product/use-price.tsx
index 0174faf5e..fd42d7033 100644
--- a/packages/kibocommerce/src/product/use-price.tsx
+++ b/packages/kibocommerce/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/kibocommerce/src/product/use-search.tsx b/packages/kibocommerce/src/product/use-search.tsx
index 204ca3181..4a9107b4a 100644
--- a/packages/kibocommerce/src/product/use-search.tsx
+++ b/packages/kibocommerce/src/product/use-search.tsx
@@ -1,5 +1,5 @@
-import { SWRHook } from '@commerce/utils/types'
-import useSearch, { UseSearch } from '@commerce/product/use-search'
+import { SWRHook } from '@vercel/commerce/utils/types'
+import useSearch, { UseSearch } from '@vercel/commerce/product/use-search'
 export default useSearch as UseSearch<typeof handler>
 
 export const handler: SWRHook<any> = {
diff --git a/packages/kibocommerce/src/types/customer.ts b/packages/kibocommerce/src/types/customer.ts
index 0061f070c..29f68fef1 100644
--- a/packages/kibocommerce/src/types/customer.ts
+++ b/packages/kibocommerce/src/types/customer.ts
@@ -1,6 +1,6 @@
-import * as Core from '@commerce/types/customer'
+import * as Core from '@vercel/commerce/types/customer'
 export type Maybe<T> = T | null
-export * from '@commerce/types/customer'
+export * from '@vercel/commerce/types/customer'
 export type Scalars = {
     ID: string
     String: string
diff --git a/packages/kibocommerce/src/types/login.ts b/packages/kibocommerce/src/types/login.ts
index 78b246191..2e7b198b2 100644
--- a/packages/kibocommerce/src/types/login.ts
+++ b/packages/kibocommerce/src/types/login.ts
@@ -1,7 +1,7 @@
-import * as Core from '@commerce/types/login'
-import type { CustomerUserAuthInfoInput } from '../schema'
+import * as Core from '@vercel/commerce/types/login'
+import type { CustomerUserAuthInfoInput } from '../../schema'
 
-export * from '@commerce/types/login'
+export * from '@vercel/commerce/types/login'
 
 export type LoginOperation = Core.LoginOperation & {
   variables: CustomerUserAuthInfoInput
diff --git a/packages/kibocommerce/src/types/logout.ts b/packages/kibocommerce/src/types/logout.ts
index 9f0a466af..1de06f8dc 100644
--- a/packages/kibocommerce/src/types/logout.ts
+++ b/packages/kibocommerce/src/types/logout.ts
@@ -1 +1 @@
-export * from '@commerce/types/logout'
+export * from '@vercel/commerce/types/logout'
diff --git a/packages/kibocommerce/src/types/page.ts b/packages/kibocommerce/src/types/page.ts
index b6bf6d2d6..f311eb8b8 100644
--- a/packages/kibocommerce/src/types/page.ts
+++ b/packages/kibocommerce/src/types/page.ts
@@ -1,4 +1,4 @@
-import * as Core from '@commerce/types/page'
+import * as Core from '@vercel/commerce/types/page'
 export type Maybe<T> = T | null
 export type Scalars = {
     ID: string
@@ -14,7 +14,7 @@ export type Scalars = {
     Object: any
 }
 
-export * from '@commerce/types/page'
+export * from '@vercel/commerce/types/page'
 
 export type Page = Core.Page
 
diff --git a/packages/kibocommerce/src/types/signup.ts b/packages/kibocommerce/src/types/signup.ts
index 58543c6f6..3f0d1af5a 100644
--- a/packages/kibocommerce/src/types/signup.ts
+++ b/packages/kibocommerce/src/types/signup.ts
@@ -1 +1 @@
-export * from '@commerce/types/signup'
+export * from '@vercel/commerce/types/signup'
diff --git a/packages/kibocommerce/src/wishlist/use-add-item.tsx b/packages/kibocommerce/src/wishlist/use-add-item.tsx
index f87e1189e..7c3d138db 100644
--- a/packages/kibocommerce/src/wishlist/use-add-item.tsx
+++ b/packages/kibocommerce/src/wishlist/use-add-item.tsx
@@ -1,8 +1,8 @@
 import { useCallback } from 'react'
-import type { MutationHook } from '@commerce/utils/types'
-import { CommerceError } from '@commerce/utils/errors'
-import useAddItem, { UseAddItem } from '@commerce/wishlist/use-add-item'
-import type { AddItemHook } from '@commerce/types/wishlist'
+import type { MutationHook } from '@vercel/commerce/utils/types'
+import { CommerceError } from '@vercel/commerce/utils/errors'
+import useAddItem, { UseAddItem } from '@vercel/commerce/wishlist/use-add-item'
+import type { AddItemHook } from '@vercel/commerce/types/wishlist'
 import useCustomer from '../customer/use-customer'
 import useWishlist from './use-wishlist'
 
diff --git a/packages/kibocommerce/src/wishlist/use-remove-item.tsx b/packages/kibocommerce/src/wishlist/use-remove-item.tsx
index 24487b7a5..8610febfb 100644
--- a/packages/kibocommerce/src/wishlist/use-remove-item.tsx
+++ b/packages/kibocommerce/src/wishlist/use-remove-item.tsx
@@ -1,10 +1,10 @@
 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 useRemoveItem, {
   UseRemoveItem,
-} from '@commerce/wishlist/use-remove-item'
-import type { RemoveItemHook } from '@commerce/types/wishlist'
+} from '@vercel/commerce/wishlist/use-remove-item'
+import type { RemoveItemHook } from '@vercel/commerce/types/wishlist'
 import useCustomer from '../customer/use-customer'
 import useWishlist from './use-wishlist'
 
diff --git a/packages/kibocommerce/src/wishlist/use-wishlist.tsx b/packages/kibocommerce/src/wishlist/use-wishlist.tsx
index f29c182ff..a91eb419b 100644
--- a/packages/kibocommerce/src/wishlist/use-wishlist.tsx
+++ b/packages/kibocommerce/src/wishlist/use-wishlist.tsx
@@ -1,7 +1,7 @@
 import { useMemo } from 'react'
-import { SWRHook } from '@commerce/utils/types'
-import useWishlist, { UseWishlist } from '@commerce/wishlist/use-wishlist'
-import type { GetWishlistHook } from '@commerce/types/wishlist'
+import { SWRHook } from '@vercel/commerce/utils/types'
+import useWishlist, { UseWishlist } from '@vercel/commerce/wishlist/use-wishlist'
+import type { GetWishlistHook } from '@vercel/commerce/types/wishlist'
 import useCustomer from '../customer/use-customer'
 
 export default useWishlist as UseWishlist<typeof handler>