mirror of
https://github.com/vercel/commerce.git
synced 2025-07-23 04:36:49 +00:00
fix: merge conflicts
This commit is contained in:
@@ -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: {
|
||||
|
Reference in New Issue
Block a user