From 94997a13240e8a19cf589d41ef2d58b7a6aefb99 Mon Sep 17 00:00:00 2001
From: Luis Alvarez <luis@vercel.com>
Date: Fri, 27 Aug 2021 12:23:45 -0500
Subject: [PATCH] Updated providers and local setup

---
 .env.template                   |  2 +-
 framework/bigcommerce/index.tsx |  3 +--
 framework/commerce/config.js    |  2 +-
 framework/local/index.tsx       | 35 ++++++---------------------------
 framework/local/provider.ts     |  3 ++-
 framework/shopify/index.tsx     |  3 +--
 6 files changed, 12 insertions(+), 36 deletions(-)

diff --git a/.env.template b/.env.template
index 1f0fe0536..2aceb9f2c 100644
--- a/.env.template
+++ b/.env.template
@@ -1,4 +1,4 @@
-# Available providers: bigcommerce, shopify, swell
+# Available providers: local, bigcommerce, shopify, swell
 COMMERCE_PROVIDER=
 
 BIGCOMMERCE_STOREFRONT_API_URL=
diff --git a/framework/bigcommerce/index.tsx b/framework/bigcommerce/index.tsx
index ab4321758..3259836b9 100644
--- a/framework/bigcommerce/index.tsx
+++ b/framework/bigcommerce/index.tsx
@@ -1,6 +1,5 @@
 import { getCommerceProvider, useCommerce as useCoreCommerce } from '@commerce'
-import { bigcommerceProvider } from './provider'
-import type { BigcommerceProvider } from './provider'
+import { bigcommerceProvider, BigcommerceProvider } from './provider'
 
 export { bigcommerceProvider }
 export type { BigcommerceProvider }
diff --git a/framework/commerce/config.js b/framework/commerce/config.js
index 28502a04e..019c59a51 100644
--- a/framework/commerce/config.js
+++ b/framework/commerce/config.js
@@ -8,12 +8,12 @@ const merge = require('deepmerge')
 const prettier = require('prettier')
 
 const PROVIDERS = [
+  'local',
   'bigcommerce',
   'saleor',
   'shopify',
   'swell',
   'vendure',
-  'local',
 ]
 
 function getProviderName() {
diff --git a/framework/local/index.tsx b/framework/local/index.tsx
index 2ec304f63..dcc713e69 100644
--- a/framework/local/index.tsx
+++ b/framework/local/index.tsx
@@ -1,32 +1,9 @@
-import * as React from 'react'
-import { ReactNode } from 'react'
-import { localProvider } from './provider'
-import {
-  CommerceConfig,
-  CommerceProvider as CoreCommerceProvider,
-  useCommerce as useCoreCommerce,
-} from '@commerce'
+import { getCommerceProvider, useCommerce as useCoreCommerce } from '@commerce'
+import { localProvider, LocalProvider } from './provider'
 
-export const localConfig: CommerceConfig = {
-  locale: 'en-us',
-  cartCookie: 'session',
-}
+export { localProvider }
+export type { LocalProvider }
 
-export function CommerceProvider({
-  children,
-  ...config
-}: {
-  children?: ReactNode
-  locale: string
-} & Partial<CommerceConfig>) {
-  return (
-    <CoreCommerceProvider
-      provider={localProvider}
-      config={{ ...localConfig, ...config }}
-    >
-      {children}
-    </CoreCommerceProvider>
-  )
-}
+export const CommerceProvider = getCommerceProvider(localProvider)
 
-export const useCommerce = () => useCoreCommerce()
+export const useCommerce = () => useCoreCommerce<LocalProvider>()
diff --git a/framework/local/provider.ts b/framework/local/provider.ts
index e6a2b0a21..53dc7f574 100644
--- a/framework/local/provider.ts
+++ b/framework/local/provider.ts
@@ -9,7 +9,6 @@ import { handler as useLogin } from './auth/use-login'
 import { handler as useLogout } from './auth/use-logout'
 import { handler as useSignup } from './auth/use-signup'
 
-export type Provider = typeof localProvider
 export const localProvider = {
   locale: 'en-us',
   cartCookie: 'session',
@@ -19,3 +18,5 @@ export const localProvider = {
   products: { useSearch },
   auth: { useLogin, useLogout, useSignup },
 }
+
+export type LocalProvider = typeof localProvider
diff --git a/framework/shopify/index.tsx b/framework/shopify/index.tsx
index 0e0fe3d69..6a8c6aa8b 100644
--- a/framework/shopify/index.tsx
+++ b/framework/shopify/index.tsx
@@ -1,6 +1,5 @@
 import { getCommerceProvider, useCommerce as useCoreCommerce } from '@commerce'
-import { shopifyProvider } from './provider'
-import type { ShopifyProvider } from './provider'
+import { shopifyProvider, ShopifyProvider } from './provider'
 
 export { shopifyProvider }
 export type { ShopifyProvider }