From f242f3c58859caee30ebbecbb0e8387c197d26d6 Mon Sep 17 00:00:00 2001
From: cond0r <pinte_catalin@yahoo.com>
Date: Thu, 25 Feb 2021 09:55:02 +0200
Subject: [PATCH] Aligned with upstream changes

---
 .../cart/CartSidebarView/CartSidebarView.tsx  |  3 ++-
 framework/commerce/with-config.js             |  2 +-
 framework/shopify/api/checkout/index.ts       | 21 +++++++++++--------
 framework/shopify/auth/use-login.tsx          |  4 +---
 framework/shopify/auth/use-logout.tsx         |  2 +-
 framework/shopify/auth/use-signup.tsx         |  2 +-
 framework/shopify/common/get-all-pages.ts     | 21 ++++++++++++++-----
 framework/shopify/common/get-page.ts          | 13 ++++++------
 framework/shopify/next.config.js              | 11 ++++++++++
 .../shopify/product/get-all-product-paths.ts  | 11 +++++++++-
 framework/shopify/product/get-all-products.ts | 14 ++++++-------
 framework/shopify/product/use-price.tsx       |  4 ++--
 framework/shopify/utils/normalize.ts          |  2 +-
 .../utils/queries/get-all-pages-query.ts      |  3 ---
 .../shopify/utils/queries/get-page-query.ts   |  1 -
 next.config.js                                |  5 +++--
 tsconfig.json                                 |  5 +++--
 17 files changed, 77 insertions(+), 47 deletions(-)
 create mode 100644 framework/shopify/next.config.js

diff --git a/components/cart/CartSidebarView/CartSidebarView.tsx b/components/cart/CartSidebarView/CartSidebarView.tsx
index 3ceda44fe..cb932247f 100644
--- a/components/cart/CartSidebarView/CartSidebarView.tsx
+++ b/components/cart/CartSidebarView/CartSidebarView.tsx
@@ -8,6 +8,7 @@ import useCart from '@framework/cart/use-cart'
 import usePrice from '@framework/product/use-price'
 import CartItem from '../CartItem'
 import s from './CartSidebarView.module.css'
+import { LineItem } from '@commerce/types'
 
 const CartSidebarView: FC = () => {
   const { closeSidebar } = useUI()
@@ -91,7 +92,7 @@ const CartSidebarView: FC = () => {
               My Cart
             </h2>
             <ul className="py-6 space-y-6 sm:py-0 sm:space-y-0 sm:divide-y sm:divide-accents-3 border-t border-accents-3">
-              {data!.lineItems.map((item) => (
+              {data!.lineItems.map((item: any) => (
                 <CartItem
                   key={item.id}
                   item={item}
diff --git a/framework/commerce/with-config.js b/framework/commerce/with-config.js
index 6dcf08986..da6705cef 100644
--- a/framework/commerce/with-config.js
+++ b/framework/commerce/with-config.js
@@ -4,7 +4,7 @@
 
 const merge = require('deepmerge')
 
-const PROVIDERS = ['bigcommerce']
+const PROVIDERS = ['bigcommerce', 'shopify']
 
 function getProviderName() {
   return process.env.BIGCOMMERCE_STOREFRONT_API_URL ? 'bigcommerce' : null
diff --git a/framework/shopify/api/checkout/index.ts b/framework/shopify/api/checkout/index.ts
index 0d0e752f0..d5d6d7f6e 100644
--- a/framework/shopify/api/checkout/index.ts
+++ b/framework/shopify/api/checkout/index.ts
@@ -21,16 +21,19 @@ const checkoutApi: ShopifyApiHandler<any> = async (req, res, config) => {
 
   const { cookies } = req
   const checkoutUrl = cookies[SHOPIFY_CHECKOUT_URL_COOKIE]
+  const customerCookie = cookies[SHOPIFY_CUSTOMER_TOKEN_COOKIE]
 
-  try {
-    await config.fetch(associateCustomerWithCheckoutMutation, {
-      variables: {
-        checkoutId: cookies[SHOPIFY_CHECKOUT_ID_COOKIE],
-        customerAccessToken: cookies[SHOPIFY_CUSTOMER_TOKEN_COOKIE],
-      },
-    })
-  } catch (error) {
-    console.error(error)
+  if (customerCookie) {
+    try {
+      await config.fetch(associateCustomerWithCheckoutMutation, {
+        variables: {
+          checkoutId: cookies[SHOPIFY_CHECKOUT_ID_COOKIE],
+          customerAccessToken: cookies[SHOPIFY_CUSTOMER_TOKEN_COOKIE],
+        },
+      })
+    } catch (error) {
+      console.error(error)
+    }
   }
 
   if (checkoutUrl) {
diff --git a/framework/shopify/auth/use-login.tsx b/framework/shopify/auth/use-login.tsx
index 9ed8d404f..2143907d8 100644
--- a/framework/shopify/auth/use-login.tsx
+++ b/framework/shopify/auth/use-login.tsx
@@ -4,14 +4,12 @@ import { CommerceError, ValidationError } from '@commerce/utils/errors'
 import useCustomer from '../customer/use-customer'
 import createCustomerAccessTokenMutation from '../utils/mutations/customer-access-token-create'
 import {
-  CustomerAccessToken,
   CustomerAccessTokenCreateInput,
-  CustomerAccessTokenCreatePayload,
   CustomerUserError,
   Mutation,
   MutationCheckoutCreateArgs,
 } from '@framework/schema'
-import useLogin, { UseLogin } from '@commerce/use-login'
+import useLogin, { UseLogin } from '@commerce/auth/use-login'
 import { setCustomerToken } from '@framework/utils'
 
 export default useLogin as UseLogin<typeof handler>
diff --git a/framework/shopify/auth/use-logout.tsx b/framework/shopify/auth/use-logout.tsx
index d5bf5f6b0..ccbeb8166 100644
--- a/framework/shopify/auth/use-logout.tsx
+++ b/framework/shopify/auth/use-logout.tsx
@@ -1,6 +1,6 @@
 import { useCallback } from 'react'
 import type { MutationHook } from '@commerce/utils/types'
-import useLogout, { UseLogout } from '@commerce/use-logout'
+import useLogout, { UseLogout } from '@commerce/auth/use-logout'
 import useCustomer from '../customer/use-customer'
 import customerAccessTokenDeleteMutation from '@framework/utils/mutations/customer-access-token-delete'
 import {
diff --git a/framework/shopify/auth/use-signup.tsx b/framework/shopify/auth/use-signup.tsx
index 7ad9e996d..f072f1925 100644
--- a/framework/shopify/auth/use-signup.tsx
+++ b/framework/shopify/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/use-signup'
+import useSignup, { UseSignup } from '@commerce/auth/use-signup'
 import useCustomer from '../customer/use-customer'
 import { CustomerCreateInput } from '@framework/schema'
 
diff --git a/framework/shopify/common/get-all-pages.ts b/framework/shopify/common/get-all-pages.ts
index 082950634..0be05ee47 100644
--- a/framework/shopify/common/get-all-pages.ts
+++ b/framework/shopify/common/get-all-pages.ts
@@ -1,5 +1,5 @@
 import { getConfig, ShopifyConfig } from '../api'
-import { Page, PageEdge } from '../schema'
+import { PageEdge } from '../schema'
 import { getAllPagesQuery } from '../utils/queries'
 
 type Variables = {
@@ -10,6 +10,14 @@ type ReturnType = {
   pages: Page[]
 }
 
+export type Page = {
+  id: string
+  name: string
+  url: string
+  sort_order?: number
+  body: string
+}
+
 const getAllPages = async (options?: {
   variables?: Variables
   config: ShopifyConfig
@@ -21,10 +29,13 @@ const getAllPages = async (options?: {
   const { data } = await config.fetch(getAllPagesQuery, { variables })
   const edges = data.pages?.edges
 
-  const pages = edges?.map(({ node }: PageEdge) => ({
-    ...node,
-    url: node.handle,
-  }))
+  const pages = edges?.map(
+    ({ node: { title: name, handle: url, ...node } }: PageEdge) => ({
+      ...node,
+      url,
+      name,
+    })
+  )
 
   return { pages }
 }
diff --git a/framework/shopify/common/get-page.ts b/framework/shopify/common/get-page.ts
index 524cece77..2a52c02d5 100644
--- a/framework/shopify/common/get-page.ts
+++ b/framework/shopify/common/get-page.ts
@@ -1,15 +1,13 @@
-import { GraphQLFetcherResult } from '@commerce/api'
-
 import { getConfig, ShopifyConfig } from '../api'
-import getPageQuery from '@framework/utils/queries/get-page-query'
-import { Page, PageEdge } from '@framework/schema'
+import getPageQuery from '../utils/queries/get-page-query'
+import { Page } from './get-all-pages'
 
 type Variables = {
   slug: string
 }
 
 type ReturnType = {
-  page: any
+  page: Page
 }
 
 const getPage = async (options: {
@@ -20,16 +18,17 @@ const getPage = async (options: {
   let { config, variables } = options ?? {}
   config = getConfig(config)
 
-  const { data }: GraphQLFetcherResult = await config.fetch(getPageQuery, {
+  const { data } = await config.fetch(getPageQuery, {
     variables,
   })
 
-  const page: Page = data.pageByHandle
+  const page = data.pageByHandle
 
   return {
     page: page
       ? {
           ...page,
+          name: page.title,
           url: page?.handle,
         }
       : null,
diff --git a/framework/shopify/next.config.js b/framework/shopify/next.config.js
new file mode 100644
index 000000000..0f9bc31ff
--- /dev/null
+++ b/framework/shopify/next.config.js
@@ -0,0 +1,11 @@
+const providerConfig = require('./config.json')
+
+module.exports = {
+  commerce: {
+    provider: 'shopify',
+    ...providerConfig,
+  },
+  images: {
+    domains: ['cdn.shopify.com'],
+  },
+}
diff --git a/framework/shopify/product/get-all-product-paths.ts b/framework/shopify/product/get-all-product-paths.ts
index 7eff4e657..4431d1e53 100644
--- a/framework/shopify/product/get-all-product-paths.ts
+++ b/framework/shopify/product/get-all-product-paths.ts
@@ -1,10 +1,19 @@
+import { Product } from '@commerce/types'
 import { getConfig, ShopifyConfig } from '../api'
 import fetchAllProducts from '../api/utils/fetch-all-products'
 import { ProductEdge } from '../schema'
 import getAllProductsPathsQuery from '../utils/queries/get-all-products-paths-query'
 
+type ProductPath = {
+  path: string
+}
+
+export type ProductPathNode = {
+  node: ProductPath
+}
+
 type ReturnType = {
-  products: any[]
+  products: ProductPathNode[]
 }
 
 const getAllProductPaths = async (options?: {
diff --git a/framework/shopify/product/get-all-products.ts b/framework/shopify/product/get-all-products.ts
index b777efc10..e1eb96aac 100644
--- a/framework/shopify/product/get-all-products.ts
+++ b/framework/shopify/product/get-all-products.ts
@@ -1,10 +1,9 @@
 import { GraphQLFetcherResult } from '@commerce/api'
 import { getConfig, ShopifyConfig } from '../api'
-import { Product, ProductEdge } from '../schema'
+import { ProductEdge } from '../schema'
 import { getAllProductsQuery } from '../utils/queries'
 import { normalizeProduct } from '@framework/utils/normalize'
-
-export type ProductNode = Product
+import { Product } from '@commerce/types'
 
 type Variables = {
   first?: number
@@ -12,7 +11,7 @@ type Variables = {
 }
 
 type ReturnType = {
-  products: any[]
+  products: Product[]
 }
 
 const getAllProducts = async (options: {
@@ -28,9 +27,10 @@ const getAllProducts = async (options: {
     { variables }
   )
 
-  const products = data.products?.edges?.map(({ node: p }: ProductEdge) =>
-    normalizeProduct(p)
-  )
+  const products =
+    data.products?.edges?.map(({ node: p }: ProductEdge) =>
+      normalizeProduct(p)
+    ) ?? []
 
   return {
     products,
diff --git a/framework/shopify/product/use-price.tsx b/framework/shopify/product/use-price.tsx
index a79940a76..0174faf5e 100644
--- a/framework/shopify/product/use-price.tsx
+++ b/framework/shopify/product/use-price.tsx
@@ -1,2 +1,2 @@
-export * from '@commerce/use-price'
-export { default } from '@commerce/use-price'
+export * from '@commerce/product/use-price'
+export { default } from '@commerce/product/use-price'
diff --git a/framework/shopify/utils/normalize.ts b/framework/shopify/utils/normalize.ts
index df8c7402b..7c3464f44 100644
--- a/framework/shopify/utils/normalize.ts
+++ b/framework/shopify/utils/normalize.ts
@@ -77,7 +77,7 @@ export function normalizeProduct(productNode: ShopifyProduct): any {
     slug: handle?.replace(/^\/+|\/+$/g, ''),
     price: money(priceRange?.minVariantPrice),
     images: normalizeProductImages(images),
-    variants: variants ? normalizeProductVariants(variants) : null,
+    variants: variants ? normalizeProductVariants(variants) : [],
     options: options ? options.map((o) => normalizeProductOption(o)) : [],
     ...rest,
   }
diff --git a/framework/shopify/utils/queries/get-all-pages-query.ts b/framework/shopify/utils/queries/get-all-pages-query.ts
index 7d1d71459..7f979dd24 100644
--- a/framework/shopify/utils/queries/get-all-pages-query.ts
+++ b/framework/shopify/utils/queries/get-all-pages-query.ts
@@ -6,9 +6,6 @@ export const getAllPagesQuery = /* GraphQL */ `
           id
           title
           handle
-          body
-          bodySummary
-          url
         }
       }
     }
diff --git a/framework/shopify/utils/queries/get-page-query.ts b/framework/shopify/utils/queries/get-page-query.ts
index 91f80f9e7..01db22e43 100644
--- a/framework/shopify/utils/queries/get-page-query.ts
+++ b/framework/shopify/utils/queries/get-page-query.ts
@@ -7,7 +7,6 @@ export const getPageQuery = /* GraphQL */ `
           title
           handle
           body
-          bodySummary
           url
         }
       }
diff --git a/next.config.js b/next.config.js
index 725024066..742a0690e 100644
--- a/next.config.js
+++ b/next.config.js
@@ -1,7 +1,8 @@
 const withCommerceConfig = require('./framework/commerce/with-config')
 
-const commerce = { provider: 'bigcommerce' }
+const commerce = { provider: 'shopify' }
 const isBC = commerce.provider === 'bigcommerce'
+const isShopify = commerce.provider === 'shopify'
 
 module.exports = withCommerceConfig({
   commerce,
@@ -11,7 +12,7 @@ module.exports = withCommerceConfig({
   },
   rewrites() {
     return [
-      isBC && {
+      (isBC || isShopify) && {
         source: '/checkout',
         destination: '/api/bigcommerce/checkout',
       },
diff --git a/tsconfig.json b/tsconfig.json
index ace763dbe..e20f37099 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -21,8 +21,9 @@
       "@assets/*": ["assets/*"],
       "@components/*": ["components/*"],
       "@commerce": ["framework/commerce"],
-      "@framework/*": ["framework/shopify/*"],
-      "@framework": ["framework/shopify"]
+      "@commerce/*": ["framework/commerce/*"],
+      "@framework": ["framework/shopify"],
+      "@framework/*": ["framework/shopify/*"]
     }
   },
   "include": ["next-env.d.ts", "**/*.d.ts", "**/*.ts", "**/*.tsx", "**/*.js"],