From 137053d61f1c893a112998092d6551568fd29044 Mon Sep 17 00:00:00 2001 From: Oliver Heywood Date: Wed, 5 Jan 2022 10:22:39 -0600 Subject: [PATCH 1/2] #629: Conversion of type 'Global & typeof globalThis' to type 'CustomNodeJsGlobal' may be a mistake --- framework/ordercloud/api/utils/fetch-rest.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/framework/ordercloud/api/utils/fetch-rest.ts b/framework/ordercloud/api/utils/fetch-rest.ts index b7f4ac6a6..61461f72b 100644 --- a/framework/ordercloud/api/utils/fetch-rest.ts +++ b/framework/ordercloud/api/utils/fetch-rest.ts @@ -144,7 +144,7 @@ export const createBuyerFetcher: ( body?: Record, fetchOptions?: Record ) => { - const customGlobal = global as CustomNodeJsGlobal; + const customGlobal = global as unknown as CustomNodeJsGlobal; // Get provider config const config = getConfig() From 614cecbafb3567fd2cad42c987ca4090acd79de8 Mon Sep 17 00:00:00 2001 From: Oliver Heywood Date: Mon, 17 Oct 2022 10:32:06 -0500 Subject: [PATCH 2/2] update env.template file with latest OrderCloud env vars --- packages/ordercloud/.env.template | 5 +++++ site/.env.template | 8 ++++++-- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/packages/ordercloud/.env.template b/packages/ordercloud/.env.template index 1423065ce..112fc7730 100644 --- a/packages/ordercloud/.env.template +++ b/packages/ordercloud/.env.template @@ -1,6 +1,11 @@ COMMERCE_PROVIDER=@vercel/commerce-ordercloud +# Required by project code. ORDERCLOUD_BUYER_CLIENT_ID= ORDERCLOUD_MIDDLEWARE_CLIENT_ID= ORDERCLOUD_MIDDLEWARE_CLIENT_SECRET= STRIPE_SECRET= + +# Marketplace configs are used by the OrderCloud - Vercel integration configuration UI to link projects. +ORDERCLOUD_MARKETPLACE_NAME= +ORDERCLOUD_MARKETPLACE_ID= diff --git a/site/.env.template b/site/.env.template index a9eb798fe..1cf4045c0 100644 --- a/site/.env.template +++ b/site/.env.template @@ -35,9 +35,13 @@ NEXT_PUBLIC_SALEOR_CHANNEL= NEXT_PUBLIC_VENDURE_SHOP_API_URL= NEXT_PUBLIC_VENDURE_LOCAL_URL= -ORDERCLOUD_CLIENT_ID= -ORDERCLOUD_CLIENT_SECRET= +ORDERCLOUD_BUYER_CLIENT_ID= +ORDERCLOUD_MIDDLEWARE_CLIENT_ID= +ORDERCLOUD_MIDDLEWARE_CLIENT_SECRET= STRIPE_SECRET= +# Marketplace configs used by the OrderCloud - Vercel integration configuration UI to link projects. +ORDERCLOUD_MARKETPLACE_NAME= +ORDERCLOUD_MARKETPLACE_ID= KIBO_API_URL= KIBO_CLIENT_ID=