From bffc1d751d45ec109879eeab9e09a66f8172778a Mon Sep 17 00:00:00 2001
From: dshukertjr <18113850+dshukertjr@users.noreply.github.com>
Date: Sat, 2 Jan 2021 21:28:14 +0900
Subject: [PATCH 1/2] Added 'User' to the exports

---
 src/index.ts | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/index.ts b/src/index.ts
index 02299a88a..9f0e70ff9 100644
--- a/src/index.ts
+++ b/src/index.ts
@@ -1,5 +1,6 @@
 import SupabaseClient from './SupabaseClient'
 import { SupabaseClientOptions, SupabaseRealtimePayload } from './lib/types'
+import { User } from '@supabase/gotrue-js'
 export * from '@supabase/gotrue-js'
 export * from '@supabase/realtime-js'
 
@@ -14,4 +15,4 @@ const createClient = (
   return new SupabaseClient(supabaseUrl, supabaseKey, options)
 }
 
-export { createClient, SupabaseClient, SupabaseClientOptions, SupabaseRealtimePayload }
+export { createClient, SupabaseClient, SupabaseClientOptions, SupabaseRealtimePayload, User }

From 618b0f86d3a5f39c71caa39bd75fcedc6b05df38 Mon Sep 17 00:00:00 2001
From: dshukertjr <18113850+dshukertjr@users.noreply.github.com>
Date: Sun, 3 Jan 2021 07:38:43 +0900
Subject: [PATCH 2/2] Exporting gotrue User as AuthUser instead of User to
 avoid potential conflicts.

---
 src/index.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/index.ts b/src/index.ts
index 9f0e70ff9..dd218716a 100644
--- a/src/index.ts
+++ b/src/index.ts
@@ -1,6 +1,6 @@
 import SupabaseClient from './SupabaseClient'
 import { SupabaseClientOptions, SupabaseRealtimePayload } from './lib/types'
-import { User } from '@supabase/gotrue-js'
+import { User as AuthUser } from '@supabase/gotrue-js'
 export * from '@supabase/gotrue-js'
 export * from '@supabase/realtime-js'
 
@@ -15,4 +15,4 @@ const createClient = (
   return new SupabaseClient(supabaseUrl, supabaseKey, options)
 }
 
-export { createClient, SupabaseClient, SupabaseClientOptions, SupabaseRealtimePayload, User }
+export { createClient, SupabaseClient, SupabaseClientOptions, SupabaseRealtimePayload, AuthUser }