From 74a93b490036e0c06ab908e5a9b7fade475f29b6 Mon Sep 17 00:00:00 2001
From: Luis Alvarez <luis@vercel.com>
Date: Fri, 21 May 2021 16:14:04 -0500
Subject: [PATCH] Updated getPage usage

---
 .../bigcommerce/api/operations/get-all-pages.ts      |  8 ++++----
 framework/bigcommerce/api/operations/login.ts        | 12 ++++++------
 pages/[...pages].tsx                                 |  9 ++++++---
 3 files changed, 16 insertions(+), 13 deletions(-)

diff --git a/framework/bigcommerce/api/operations/get-all-pages.ts b/framework/bigcommerce/api/operations/get-all-pages.ts
index d6b9f647a..2f07670ff 100644
--- a/framework/bigcommerce/api/operations/get-all-pages.ts
+++ b/framework/bigcommerce/api/operations/get-all-pages.ts
@@ -9,10 +9,10 @@ import { BigcommerceConfig, Provider } from '..'
 export default function getAllPagesOperation({
   commerce,
 }: OperationContext<Provider>) {
-  async function getAllPages(opts?: {
+  async function getAllPages<T extends GetAllPagesOperation>(opts?: {
     config?: BigcommerceConfig
     preview?: boolean
-  }): Promise<GetAllPagesOperation['data']>
+  }): Promise<T['data']>
 
   async function getAllPages<T extends GetAllPagesOperation>(
     opts: {
@@ -21,14 +21,14 @@ export default function getAllPagesOperation({
     } & OperationOptions
   ): Promise<T['data']>
 
-  async function getAllPages({
+  async function getAllPages<T extends GetAllPagesOperation>({
     config,
     preview,
   }: {
     url?: string
     config?: BigcommerceConfig
     preview?: boolean
-  } = {}): Promise<GetAllPagesOperation['data']> {
+  } = {}): Promise<T['data']> {
     config = commerce.getConfig(config)
     // RecursivePartial forces the method to check for every prop in the data, which is
     // required in case there's a custom `url`
diff --git a/framework/bigcommerce/api/operations/login.ts b/framework/bigcommerce/api/operations/login.ts
index f05924fc8..021ba3c65 100644
--- a/framework/bigcommerce/api/operations/login.ts
+++ b/framework/bigcommerce/api/operations/login.ts
@@ -20,11 +20,11 @@ export const loginMutation = /* GraphQL */ `
 export default function loginOperation({
   commerce,
 }: OperationContext<Provider>) {
-  async function login(opts: {
-    variables: LoginOperation['variables']
+  async function login<T extends LoginOperation>(opts: {
+    variables: T['variables']
     config?: BigcommerceConfig
     res: ServerResponse
-  }): Promise<LoginOperation['data']>
+  }): Promise<T['data']>
 
   async function login<T extends LoginOperation>(
     opts: {
@@ -34,17 +34,17 @@ export default function loginOperation({
     } & OperationOptions
   ): Promise<T['data']>
 
-  async function login({
+  async function login<T extends LoginOperation>({
     query = loginMutation,
     variables,
     res: response,
     config,
   }: {
     query?: string
-    variables: LoginOperation['variables']
+    variables: T['variables']
     res: ServerResponse
     config?: BigcommerceConfig
-  }): Promise<LoginOperation['data']> {
+  }): Promise<T['data']> {
     config = commerce.getConfig(config)
 
     const { data, res } = await config.fetch<RecursivePartial<LoginMutation>>(
diff --git a/pages/[...pages].tsx b/pages/[...pages].tsx
index 91e4fb875..fbb732c1a 100644
--- a/pages/[...pages].tsx
+++ b/pages/[...pages].tsx
@@ -3,13 +3,12 @@ import type {
   GetStaticPropsContext,
   InferGetStaticPropsType,
 } from 'next'
+import commerce from '@lib/api/commerce'
 import { Text } from '@components/ui'
 import { Layout } from '@components/common'
-import commerce from '@lib/api/commerce'
 import getSlug from '@lib/get-slug'
 import { missingLocaleInPages } from '@lib/usage-warns'
 import { getConfig } from '@framework/api'
-import getPage from '@framework/api/operations/get-page'
 import { defaultPageProps } from '@lib/defaults'
 
 export async function getStaticProps({
@@ -26,7 +25,11 @@ export async function getStaticProps({
   const data =
     pageItem &&
     // TODO: Shopify - Fix this type
-    (await getPage({ variables: { id: pageItem.id! } as any, config, preview }))
+    (await commerce.getPage({
+      variables: { id: pageItem.id! } as any,
+      config,
+      preview,
+    }))
   const page = data?.page
 
   if (!page) {