Update to Next.js 13 (vercel#870)

vendure-ecommerce · Dec 21, 2022 · 4efa502 · 4efa502
1 parent 6d783ea
commit 4efa502
Show file tree

Hide file tree

Showing 60 changed files with 889 additions and 454 deletions.
diff --git a/packages/bigcommerce/package.json b/packages/bigcommerce/package.json
@@ -58,7 +58,7 @@
     "uuidv4": "^6.2.13"
   },
   "peerDependencies": {
-    "next": "^12",
+    "next": "^13",
     "react": "^18",
     "react-dom": "^18"
   },
@@ -73,7 +73,7 @@
     "@types/node-fetch": "^2.6.2",
     "@types/react": "^18.0.14",
     "lint-staged": "^12.1.7",
-    "next": "^12.0.8",
+    "next": "^13.0.6",
     "prettier": "^2.5.1",
     "react": "^18.2.0",
     "react-dom": "^18.2.0",

diff --git a/packages/bigcommerce/src/api/endpoints/checkout/get-checkout.ts b/packages/bigcommerce/src/api/endpoints/checkout/get-checkout.ts
@@ -8,8 +8,8 @@ const getCheckout: CheckoutEndpoint['handlers']['getCheckout'] = async ({
   config,
 }) => {
   const { cookies } = req
-  const cartId = cookies.get(config.cartCookie)
-  const customerToken = cookies.get(config.customerCookie)
+  const cartId = cookies.get(config.cartCookie)?.value
+  const customerToken = cookies.get(config.customerCookie)?.value
 
   if (!cartId) {
     return { redirectTo: '/cart' }

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
@@ -27,7 +27,7 @@ export type Customer = NonNullable<GetLoggedInCustomerQuery['customer']>
 
 const getLoggedInCustomer: CustomerEndpoint['handlers']['getLoggedInCustomer'] =
   async ({ req, config }) => {
-    const token = req.cookies.get(config.customerCookie)
+    const token = req.cookies.get(config.customerCookie)?.value
 
     if (token) {
       const { data } = await config.fetch<GetLoggedInCustomerQuery>(

diff --git a/packages/commerce/package.json b/packages/commerce/package.json
@@ -55,7 +55,7 @@
     "zod": "^3.19.1"
   },
   "peerDependencies": {
-    "next": "^12",
+    "next": "^13",
     "react": "^18",
     "react-dom": "^18"
   },
@@ -68,7 +68,7 @@
     "@types/node-fetch": "2.6.2",
     "@types/react": "^18.0.14",
     "lint-staged": "^12.1.7",
-    "next": "^12.0.8",
+    "next": "^13.0.6",
     "prettier": "^2.5.1",
     "react": "^18.2.0",
     "react-dom": "^18.2.0",

diff --git a/packages/commerce/src/api/endpoints/cart.ts b/packages/commerce/src/api/endpoints/cart.ts
@@ -29,7 +29,7 @@ const cartEndpoint: GetAPISchema<
 
   let output
   const { cookies } = req
-  const cartId = cookies.get(config.cartCookie)
+  const cartId = cookies.get(config.cartCookie)?.value
 
   // Return current cart info
   if (req.method === 'GET') {

diff --git a/packages/commerce/src/api/endpoints/checkout.ts b/packages/commerce/src/api/endpoints/checkout.ts
@@ -22,7 +22,7 @@ const checkoutEndpoint: GetAPISchema<
   })
 
   const { cookies } = req
-  const cartId = cookies.get(config.cartCookie)!
+  const cartId = cookies.get(config.cartCookie)?.value
   const input = await getInput(req)
 
   // Get checkout

diff --git a/packages/commerce/src/api/endpoints/customer/address.ts b/packages/commerce/src/api/endpoints/customer/address.ts
@@ -33,7 +33,7 @@ const customerShippingEndpoint: GetAPISchema<
   const { cookies } = req
 
   // Cart id might be usefull for anonymous shopping
-  const cartId = cookies.get(config.cartCookie)
+  const cartId = cookies.get(config.cartCookie)?.value
 
   // Return customer addresses
   if (req.method === 'GET') {

diff --git a/packages/commerce/src/api/endpoints/customer/card.ts b/packages/commerce/src/api/endpoints/customer/card.ts
@@ -31,7 +31,7 @@ const customerCardEndpoint: GetAPISchema<
   const { cookies } = req
 
   // Cart id might be usefull for anonymous shopping
-  const cartId = cookies.get(config.cartCookie)
+  const cartId = cookies.get(config.cartCookie)?.value
 
   // Create or add a card
   if (req.method === 'GET') {

diff --git a/packages/commerce/src/api/endpoints/customer/index.ts b/packages/commerce/src/api/endpoints/customer/index.ts
@@ -1,6 +1,6 @@
 import type { CustomerSchema } from '../../../types/customer'
 import type { GetAPISchema } from '../..'
-
+import { z } from 'zod'
 import { parse } from '../../utils'
 import validateHandlers from '../../utils/validate-handlers'
 
@@ -19,7 +19,14 @@ const customerEndpoint: GetAPISchema<
   const body = null
   const output = await handlers['getLoggedInCustomer']({ ...ctx, body })
 
-  return output ? parse(output, customerSchema) : { status: 204 }
+  return output
+    ? parse(
+        output,
+        z.object({
+          customer: customerSchema,
+        })
+      )
+    : { status: 204 }
 }
 
 export default customerEndpoint
diff --git a/packages/commerce/src/api/endpoints/signup.ts b/packages/commerce/src/api/endpoints/signup.ts
@@ -18,7 +18,7 @@ const signupEndpoint: GetAPISchema<
 
   const input = await getInput(req)
   const { cookies } = req
-  const cartId = cookies.get(config.cartCookie)
+  const cartId = cookies.get(config.cartCookie)?.value
 
   const body = signupBodySchema.parse({ ...input, cartId })
   return handlers['signup']({ ...ctx, body })

diff --git a/packages/commerce/src/api/endpoints/wishlist.ts b/packages/commerce/src/api/endpoints/wishlist.ts
@@ -28,7 +28,7 @@ const wishlistEndpoint: GetAPISchema<
   const { cookies } = req
   const input = await getInput(req)
 
-  const customerToken = cookies.get(config.customerCookie)
+  const customerToken = cookies.get(config.customerCookie)?.value
   const products = new URL(req.url).searchParams.get('products')
 
   // Return current wishlist info

diff --git a/packages/commercejs/package.json b/packages/commercejs/package.json
@@ -55,7 +55,7 @@
     "lodash.debounce": "^4.0.8"
   },
   "peerDependencies": {
-    "next": "^12",
+    "next": "^13",
     "react": "^18",
     "react-dom": "^18"
   },
@@ -71,7 +71,7 @@
     "@types/node": "^17.0.8",
     "@types/react": "^18.0.14",
     "lint-staged": "^12.1.7",
-    "next": "^12.0.8",
+    "next": "^13.0.6",
     "prettier": "^2.5.1",
     "react": "^18.2.0",
     "react-dom": "^18.2.0",

diff --git a/packages/kibocommerce/package.json b/packages/kibocommerce/package.json
@@ -53,11 +53,12 @@
     "lodash.debounce": "^4.0.8"
   },
   "peerDependencies": {
-    "next": "^12",
+    "next": "^13",
     "react": "^18",
     "react-dom": "^18"
   },
   "devDependencies": {
+    "@babel/core": "^7.20.5",
     "@graphql-codegen/cli": "^2.7.0",
     "@graphql-codegen/schema-ast": "^2.4.1",
     "@graphql-codegen/typescript": "^2.4.2",
@@ -71,7 +72,7 @@
     "@types/react": "^18.0.14",
     "graphql": "^16.0.0",
     "lint-staged": "^12.1.7",
-    "next": "^12.0.8",
+    "next": "^13.0.6",
     "prettier": "^2.5.1",
     "react": "^18.2.0",
     "react-dom": "^18.2.0",

diff --git a/packages/kibocommerce/src/api/endpoints/cart/remove-item.ts b/packages/kibocommerce/src/api/endpoints/cart/remove-item.ts
@@ -8,7 +8,8 @@ const removeItem: CartEndpoint['handlers']['removeItem'] = async ({
   body: { itemId },
   config,
 }) => {
-  const encodedToken = req.cookies.get(config.customerCookie)
+  const encodedToken = req.cookies.get(config.customerCookie)?.value
+
   const token = encodedToken
     ? Buffer.from(encodedToken, 'base64').toString('ascii')
     : null

diff --git a/packages/kibocommerce/src/api/endpoints/cart/update-item.ts b/packages/kibocommerce/src/api/endpoints/cart/update-item.ts
@@ -8,7 +8,7 @@ const updateItem: CartEndpoint['handlers']['updateItem'] = async ({
   body: { itemId, item },
   config,
 }) => {
-  const encodedToken = req.cookies.get(config.cartCookie)
+  const encodedToken = req.cookies.get(config.cartCookie)?.value
   const token = encodedToken
     ? Buffer.from(encodedToken, 'base64').toString('ascii')
     : null

diff --git a/packages/kibocommerce/src/api/utils/cookie-handler.ts b/packages/kibocommerce/src/api/utils/cookie-handler.ts
@@ -19,7 +19,7 @@ export default class CookieHandler {
     this.config = config
     this.request = req
 
-    const encodedToken = req.cookies.get(config.customerCookie)
+    const encodedToken = req.cookies.get(config.customerCookie)?.value
     const token = parseCookie(encodedToken)
     this.accessToken = token ? token.accessToken : null
   }
@@ -36,7 +36,7 @@ export default class CookieHandler {
   }
   isShopperCookieAnonymous() {
     const customerCookieKey = this.config.customerCookie
-    const shopperCookie = this.request.cookies.get(customerCookieKey)
+    const shopperCookie = this.request.cookies.get(customerCookieKey)?.value
     const shopperSession = parseCookie(shopperCookie)
     const isAnonymous = shopperSession?.customerAccount ? false : true
     return isAnonymous

diff --git a/packages/local/package.json b/packages/local/package.json
@@ -50,7 +50,7 @@
     "@vercel/commerce": "workspace:*"
   },
   "peerDependencies": {
-    "next": "^12",
+    "next": "^13",
     "react": "^18",
     "react-dom": "^18"
   },
@@ -62,7 +62,7 @@
     "@types/react": "^18.0.14",
     "@types/node-fetch": "2.6.2",
     "lint-staged": "^12.1.7",
-    "next": "^12.0.8",
+    "next": "^13.0.6",
     "prettier": "^2.5.1",
     "react": "^18.2.0",
     "react-dom": "^18.2.0",

diff --git a/packages/ordercloud/package.json b/packages/ordercloud/package.json
@@ -52,7 +52,7 @@
     "cookie": "^0.4.1"
   },
   "peerDependencies": {
-    "next": "^12",
+    "next": "^13",
     "react": "^18",
     "react-dom": "^18"
   },
@@ -66,7 +66,7 @@
     "@types/cookie": "^0.4.1",
     "@types/node-fetch": "^2.6.2",
     "lint-staged": "^12.1.7",
-    "next": "^12.0.8",
+    "next": "^13.0.6",
     "prettier": "^2.5.1",
     "react": "^18.2.0",
     "react-dom": "^18.2.0",

diff --git a/packages/ordercloud/src/api/endpoints/cart/add-item.ts b/packages/ordercloud/src/api/endpoints/cart/add-item.ts
@@ -10,7 +10,7 @@ const addItem: CartEndpoint['handlers']['addItem'] = async ({
   config: { restBuyerFetch, cartCookie, tokenCookie },
 }) => {
   // Get token
-  let token = req.cookies.get(tokenCookie)
+  let token = req.cookies.get(tokenCookie)?.value
   let headers: any = {}
 
   // Create an order if it doesn't exist

diff --git a/packages/ordercloud/src/api/endpoints/cart/get-cart.ts b/packages/ordercloud/src/api/endpoints/cart/get-cart.ts
@@ -16,7 +16,7 @@ const getCart: CartEndpoint['handlers']['getCart'] = async ({
 
   try {
     // Get token
-    const token = req.cookies.get(tokenCookie)
+    const token = req.cookies.get(tokenCookie)?.value
 
     // Get cart & line items
     const [cart, { Items }] = await Promise.all([

diff --git a/packages/ordercloud/src/api/endpoints/cart/remove-item.ts b/packages/ordercloud/src/api/endpoints/cart/remove-item.ts
@@ -7,7 +7,7 @@ const removeItem: CartEndpoint['handlers']['removeItem'] = async ({
   body: { cartId, itemId },
   config: { restBuyerFetch, tokenCookie },
 }) => {
-  const token = req.cookies.get(tokenCookie)
+  const token = req.cookies.get(tokenCookie)?.value
 
   // Remove the item to the order
   await restBuyerFetch(

diff --git a/packages/ordercloud/src/api/endpoints/cart/update-item.ts b/packages/ordercloud/src/api/endpoints/cart/update-item.ts
@@ -9,7 +9,7 @@ const updateItem: CartEndpoint['handlers']['updateItem'] = async ({
   body: { cartId, itemId, item },
   config: { restBuyerFetch, tokenCookie },
 }) => {
-  const token = req.cookies.get(tokenCookie)
+  const token = req.cookies.get(tokenCookie)?.value
 
   // Store specs
   let specs: RawVariant['Specs'] = []

diff --git a/packages/ordercloud/src/api/endpoints/catalog/products/get-products.ts b/packages/ordercloud/src/api/endpoints/catalog/products/get-products.ts
@@ -7,7 +7,7 @@ const getProducts: ProductsEndpoint['handlers']['getProducts'] = async ({
   body: { search, categoryId },
   config: { restBuyerFetch, tokenCookie },
 }) => {
-  const token = req.cookies.get(tokenCookie)
+  const token = req.cookies.get(tokenCookie)?.value
 
   //Use a dummy base as we only care about the relative path
   const url = new URL('/me/products', 'http://a')

diff --git a/packages/ordercloud/src/api/endpoints/checkout/get-checkout.ts b/packages/ordercloud/src/api/endpoints/checkout/get-checkout.ts
@@ -5,7 +5,7 @@ const getCheckout: CheckoutEndpoint['handlers']['getCheckout'] = async ({
   body: { cartId },
   config: { restBuyerFetch },
 }) => {
-  const token = req.cookies.get('token')
+  const token = req.cookies.get('token')?.value
 
   // Register credit card
   const payments = await restBuyerFetch(

diff --git a/packages/ordercloud/src/api/endpoints/checkout/submit-checkout.ts b/packages/ordercloud/src/api/endpoints/checkout/submit-checkout.ts
@@ -5,7 +5,7 @@ const submitCheckout: CheckoutEndpoint['handlers']['submitCheckout'] = async ({
   body: { cartId },
   config: { restBuyerFetch, tokenCookie },
 }) => {
-  const token = req.cookies.get(tokenCookie)
+  const token = req.cookies.get(tokenCookie)?.value
 
   // Submit order
   await restBuyerFetch('POST', `/orders/Outgoing/${cartId}/submit`, null, {

diff --git a/packages/ordercloud/src/api/endpoints/customer/address/add-item.ts b/packages/ordercloud/src/api/endpoints/customer/address/add-item.ts
@@ -5,7 +5,7 @@ const addItem: CustomerAddressEndpoint['handlers']['addItem'] = async ({
   body: { item, cartId },
   config: { restBuyerFetch, tokenCookie },
 }) => {
-  const token = req.cookies.get(tokenCookie)
+  const token = req.cookies.get(tokenCookie)?.value
 
   // Register address
   const address = await restBuyerFetch('POST', `/me/addresses`, {

diff --git a/packages/ordercloud/src/api/endpoints/customer/card/add-item.ts b/packages/ordercloud/src/api/endpoints/customer/card/add-item.ts
@@ -7,7 +7,7 @@ const addItem: CustomerCardEndpoint['handlers']['addItem'] = async ({
   config: { restBuyerFetch, tokenCookie },
 }) => {
   // Get token
-  const token = req.cookies.get(tokenCookie)
+  const token = req.cookies.get(tokenCookie)?.value
 
   const [exp_month, exp_year] = item.cardExpireDate.split('/')
   const stripeToken = await fetch('https://api.stripe.com/v1/tokens', {

diff --git a/packages/saleor/package.json b/packages/saleor/package.json
@@ -54,11 +54,12 @@
     "lodash.debounce": "^4.0.8"
   },
   "peerDependencies": {
-    "next": "^12",
+    "next": "^13",
     "react": "^18",
     "react-dom": "^18"
   },
   "devDependencies": {
+    "@babel/core": "^7.20.5",
     "@graphql-codegen/cli": "^2.7.0",
     "@graphql-codegen/schema-ast": "^2.4.1",
     "@graphql-codegen/typescript": "^2.4.2",
@@ -73,7 +74,7 @@
     "@types/react": "^18.0.14",
     "graphql": "^16.0.0",
     "lint-staged": "^12.1.7",
-    "next": "^12.0.8",
+    "next": "^13.0.6",
     "prettier": "^2.5.1",
     "react": "^18.2.0",
     "react-dom": "^18.2.0",

diff --git a/packages/sfcc/package.json b/packages/sfcc/package.json
@@ -51,7 +51,7 @@
     "commerce-sdk": "^2.7.0"
   },
   "peerDependencies": {
-    "next": "^12",
+    "next": "^13",
     "react": "^18",
     "react-dom": "^18"
   },
@@ -63,7 +63,7 @@
     "@types/react": "^18.0.14",
     "@types/node-fetch": "^2.6.2",
     "lint-staged": "^12.1.7",
-    "next": "^12.0.8",
+    "next": "^13.0.6",
     "prettier": "^2.5.1",
     "react": "^18.2.0",
     "react-dom": "^18.2.0",

diff --git a/packages/shopify/package.json b/packages/shopify/package.json
@@ -54,11 +54,12 @@
     "lodash.debounce": "^4.0.8"
   },
   "peerDependencies": {
-    "next": "^12",
+    "next": "^13",
     "react": "^18",
     "react-dom": "^18"
   },
   "devDependencies": {
+    "@babel/core": "^7.20.5",
     "@graphql-codegen/cli": "2.7.0",
     "@graphql-codegen/schema-ast": "^2.4.1",
     "@graphql-codegen/typescript": "^2.6.0",
@@ -69,10 +70,10 @@
     "@types/js-cookie": "3.0.2",
     "@types/lodash.debounce": "^4.0.7",
     "@types/node": "^18.0.3",
-    "@types/react": "^18.0.14",
     "@types/node-fetch": "2.6.2",
-    "graphql": "^16.0.0",
+    "@types/react": "^18.0.14",
     "dotenv": "^16.0.1",
+    "graphql": "^16.0.0",
     "lint-staged": "^13.0.3",
     "next": "^12.2.1",
     "prettier": "^2.7.1",