fix: merge conflicts

This commit is contained in:
cristiancc
2021-04-28 15:13:35 -05:00
13 changed files with 21 additions and 33 deletions

View File

@@ -1,8 +1,7 @@
import { GraphQLFetcherResult } from '@commerce/api'
import { getConfig, ReactionCommerceConfig } from '../api'
import { CatalogItemEdge, CatalogItemProduct } from '../schema'
import { catalogItemsQuery } from '../utils/queries'
import { normalizeProduct } from '../utils/normalize'
import { catalogItemsQuery, normalizeProduct } from '../utils'
import { Product } from '@commerce/types'
type Variables = {
@@ -11,7 +10,7 @@ type Variables = {
}
type ReturnType = {
products: CatalogItemConnection[]
products: Product[]
}
const getAllProducts = async (options: {