Merge branch 'master' into shopify-i18n

framework/shopify/customer/use-customer.tsx

@@ -10,11 +10,15 @@ export const handler: SWRHook<Customer | null> = {
     query: getCustomerQuery,
   },
   async fetcher({ options, fetch }) {
-    const data = await fetch<any | null>({
-      ...options,
-      variables: { customerAccessToken: getCustomerToken() },
-    })
-    return data.customer ?? null
+    const customerAccessToken = getCustomerToken()
+    if (customerAccessToken) {
+      const data = await fetch({
+        ...options,
+        variables: { customerAccessToken: getCustomerToken() },
+      })
+      return data.customer
+    }
+    return null
   },
   useHook: ({ useData }) => (input) => {
     return useData({

framework/shopify/product/get-all-product-paths.ts

@@ -1,5 +1,4 @@
 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'
 
@@ -20,21 +19,22 @@ const getAllProductPaths = async (options?: {
   config?: ShopifyConfig
   preview?: boolean
 }): Promise<ReturnType> => {
-  let { config, variables = { first: 250 } } = options ?? {}
+  let { config, variables = { first: 100, sortKey: 'BEST_SELLING' } } =
+    options ?? {}
   config = getConfig(config)
 
-  const products = await fetchAllProducts({
-    config,
-    query: getAllProductsPathsQuery,
+  const { data } = await config.fetch(getAllProductsPathsQuery, {
     variables,
   })
 
   return {
-    products: products?.map(({ node: { handle } }: ProductEdge) => ({
-      node: {
-        path: `/${handle}`,
-      },
-    })),
+    products: data.products?.edges?.map(
+      ({ node: { handle } }: ProductEdge) => ({
+        node: {
+          path: `/${handle}`,
+        },
+      })
+    ),
   }
 }
 

framework/shopify/product/get-all-products.ts

@@ -35,6 +35,7 @@ const getAllProducts = async (options: {
       }),
     }
   )
+  
   products = [
     ...products,
     ...data.products.edges.map(({ node: p }) => normalizeProduct(p)),