-
-
+
+
-
씨앗 순장
+
+ 씨앗 순장
+
);
}
diff --git a/src/lib/env.ts b/src/lib/env.ts
index 2225543..ef81d64 100644
--- a/src/lib/env.ts
+++ b/src/lib/env.ts
@@ -6,12 +6,15 @@ type ServerEnv = {
};
type SupabaseEnv = {
- NEXT_PUBLIC_SUPABASE_URL: string;
- NEXT_PUBLIC_SUPABASE_PUBLISHABLE_DEFAULT_KEY: string;
+ SUPABASE_URL: string;
+ SUPABASE_PUBLISHABLE_DEFAULT_KEY: string;
};
function resolveSupabasePublishableKey() {
return (
+ process.env.SUPABASE_PUBLISHABLE_DEFAULT_KEY ||
+ process.env.SUPABASE_PUBLISHABLE_KEY ||
+ process.env.SUPABASE_ANON_KEY ||
process.env.NEXT_PUBLIC_SUPABASE_PUBLISHABLE_DEFAULT_KEY ||
process.env.NEXT_PUBLIC_SUPABASE_PUBLISHABLE_KEY ||
process.env.NEXT_PUBLIC_SUPABASE_ANON_KEY ||
@@ -37,14 +40,14 @@ export function getServerEnv(): ServerEnv {
}
export function getSupabaseEnv(): SupabaseEnv {
- const supabaseUrl = process.env.NEXT_PUBLIC_SUPABASE_URL;
+ const supabaseUrl = process.env.SUPABASE_URL || process.env.NEXT_PUBLIC_SUPABASE_URL;
const supabasePublishableKey = resolveSupabasePublishableKey();
if (!supabaseUrl || !supabasePublishableKey) {
const missing = [
- !supabaseUrl ? "NEXT_PUBLIC_SUPABASE_URL" : null,
+ !supabaseUrl ? "SUPABASE_URL (or NEXT_PUBLIC_SUPABASE_URL)" : null,
!supabasePublishableKey
- ? "NEXT_PUBLIC_SUPABASE_PUBLISHABLE_DEFAULT_KEY (or NEXT_PUBLIC_SUPABASE_PUBLISHABLE_KEY)"
+ ? "SUPABASE_PUBLISHABLE_DEFAULT_KEY (or SUPABASE_PUBLISHABLE_KEY / SUPABASE_ANON_KEY)"
: null,
]
.filter(Boolean)
@@ -53,13 +56,13 @@ export function getSupabaseEnv(): SupabaseEnv {
}
return {
- NEXT_PUBLIC_SUPABASE_URL: supabaseUrl,
- NEXT_PUBLIC_SUPABASE_PUBLISHABLE_DEFAULT_KEY: supabasePublishableKey,
+ SUPABASE_URL: supabaseUrl,
+ SUPABASE_PUBLISHABLE_DEFAULT_KEY: supabasePublishableKey,
};
}
export function getSupabaseEnvOrNull(): SupabaseEnv | null {
- const supabaseUrl = process.env.NEXT_PUBLIC_SUPABASE_URL;
+ const supabaseUrl = process.env.SUPABASE_URL || process.env.NEXT_PUBLIC_SUPABASE_URL;
const supabasePublishableKey = resolveSupabasePublishableKey();
if (!supabaseUrl || !supabasePublishableKey) {
@@ -67,7 +70,7 @@ export function getSupabaseEnvOrNull(): SupabaseEnv | null {
}
return {
- NEXT_PUBLIC_SUPABASE_URL: supabaseUrl,
- NEXT_PUBLIC_SUPABASE_PUBLISHABLE_DEFAULT_KEY: supabasePublishableKey,
+ SUPABASE_URL: supabaseUrl,
+ SUPABASE_PUBLISHABLE_DEFAULT_KEY: supabasePublishableKey,
};
}
diff --git a/src/lib/supabase/client.ts b/src/lib/supabase/client.ts
deleted file mode 100644
index 904b606..0000000
--- a/src/lib/supabase/client.ts
+++ /dev/null
@@ -1,29 +0,0 @@
-"use client";
-
-import { createBrowserClient } from "@supabase/ssr";
-
-import { getSupabaseEnv, getSupabaseEnvOrNull } from "@/lib/env";
-
-let browserClient: ReturnType
| null = null;
-
-export function createSupabaseBrowserClient() {
- if (browserClient) {
- return browserClient;
- }
-
- const { NEXT_PUBLIC_SUPABASE_URL, NEXT_PUBLIC_SUPABASE_PUBLISHABLE_DEFAULT_KEY } =
- getSupabaseEnv();
- browserClient = createBrowserClient(
- NEXT_PUBLIC_SUPABASE_URL,
- NEXT_PUBLIC_SUPABASE_PUBLISHABLE_DEFAULT_KEY,
- );
- return browserClient;
-}
-
-export function createSupabaseBrowserClientOrNull() {
- const env = getSupabaseEnvOrNull();
- if (!env) {
- return null;
- }
- return createSupabaseBrowserClient();
-}
diff --git a/src/lib/supabase/middleware.ts b/src/lib/supabase/middleware.ts
index db9668d..95d0801 100644
--- a/src/lib/supabase/middleware.ts
+++ b/src/lib/supabase/middleware.ts
@@ -17,8 +17,8 @@ export async function updateSupabaseSession(request: NextRequest) {
});
const supabase = createServerClient(
- env.NEXT_PUBLIC_SUPABASE_URL,
- env.NEXT_PUBLIC_SUPABASE_PUBLISHABLE_DEFAULT_KEY,
+ env.SUPABASE_URL,
+ env.SUPABASE_PUBLISHABLE_DEFAULT_KEY,
{
cookies: {
getAll() {
diff --git a/src/lib/supabase/server.ts b/src/lib/supabase/server.ts
index 7961be2..17214a3 100644
--- a/src/lib/supabase/server.ts
+++ b/src/lib/supabase/server.ts
@@ -5,12 +5,11 @@ import { getSupabaseEnv } from "@/lib/env";
export async function createSupabaseServerClient() {
const cookieStore = await cookies();
- const { NEXT_PUBLIC_SUPABASE_URL, NEXT_PUBLIC_SUPABASE_PUBLISHABLE_DEFAULT_KEY } =
- getSupabaseEnv();
+ const { SUPABASE_URL, SUPABASE_PUBLISHABLE_DEFAULT_KEY } = getSupabaseEnv();
return createServerClient(
- NEXT_PUBLIC_SUPABASE_URL,
- NEXT_PUBLIC_SUPABASE_PUBLISHABLE_DEFAULT_KEY,
+ SUPABASE_URL,
+ SUPABASE_PUBLISHABLE_DEFAULT_KEY,
{
cookies: {
getAll() {
diff --git a/src/lib/utils.ts b/src/lib/utils.ts
index 73a7dbd..bd0c391 100644
--- a/src/lib/utils.ts
+++ b/src/lib/utils.ts
@@ -1,7 +1,6 @@
-//NOTE: Utility helpers shared across UI components.
-import { clsx, type ClassValue } from "clsx";
-import { twMerge } from "tailwind-merge";
+import { clsx, type ClassValue } from "clsx"
+import { twMerge } from "tailwind-merge"
export function cn(...inputs: ClassValue[]) {
- return twMerge(clsx(inputs));
+ return twMerge(clsx(inputs))
}