Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions apps/roam/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
},
"license": "Apache-2.0",
"devDependencies": {
"@repo/database": "*",
"@repo/tailwind-config": "*",
"@types/contrast-color": "^1.0.0",
"@types/react-vertical-timeline-component": "^3.3.3",
Expand Down
8 changes: 5 additions & 3 deletions apps/roam/scripts/compile.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ import esbuild from "esbuild";
import fs from "fs";
import path from "path";
import { z } from "zod";
import { envContents } from "@repo/database/dbDotEnv";

// https://github.com/evanw/esbuild/issues/337#issuecomment-954633403
const importAsGlobals = (
Expand Down Expand Up @@ -122,6 +123,7 @@ export const compile = ({
fs.mkdirSync(outdir, { recursive: true });

const buildPromises = [] as Promise<void>[];
const dbEnv = envContents();
buildPromises.push(
builder({
absWorkingDir: process.cwd(),
Expand All @@ -130,9 +132,9 @@ export const compile = ({
bundle: true,
format,
define: {
"process.env.SUPABASE_URL": `"${process.env.SUPABASE_URL}"`,
"process.env.SUPABASE_ANON_KEY": `"${process.env.SUPABASE_ANON_KEY}"`,
"process.env.NEXT_API_ROOT": `"${process.env.NEXT_API_ROOT || ""}"`,
"process.env.SUPABASE_URL": `"${dbEnv.SUPABASE_URL}"`,
"process.env.SUPABASE_ANON_KEY": `"${dbEnv.SUPABASE_ANON_KEY}"`,
"process.env.NEXT_API_ROOT": `"${dbEnv.NEXT_API_ROOT || ""}"`,
},
sourcemap: process.env.NODE_ENV === "production" ? undefined : "inline",
minify: process.env.NODE_ENV === "production",
Expand Down
6 changes: 4 additions & 2 deletions apps/website/app/utils/supabase/client.ts
Original file line number Diff line number Diff line change
@@ -1,11 +1,13 @@
import { createClient as createSupabaseClient } from "@supabase/supabase-js";
import { Database } from "@repo/database/types.gen.ts";
import { envContents } from "@repo/database/dbDotEnv";

// Inspired by https://supabase.com/ui/docs/nextjs/password-based-auth

export const createClient = () => {
const url = process.env.NEXT_PUBLIC_SUPABASE_URL;
const key = process.env.NEXT_PUBLIC_SUPABASE_ANON_KEY;
const dbEnv = envContents();
const url = dbEnv.SUPABASE_URL;
const key = dbEnv.SUPABASE_ANON_KEY;

if (!url || !key) {
throw new Error("Missing required Supabase environment variables");
Expand Down
6 changes: 4 additions & 2 deletions apps/website/app/utils/supabase/middleware.ts
Original file line number Diff line number Diff line change
@@ -1,11 +1,13 @@
import { createServerClient } from "@supabase/ssr";
import { NextResponse, type NextRequest } from "next/server";
import { envContents } from "@repo/database/dbDotEnv";

// Inspired by https://supabase.com/ui/docs/nextjs/password-based-auth

export const updateSession = async (request: NextRequest) => {
const supabaseUrl = process.env.NEXT_PUBLIC_SUPABASE_URL;
const supabaseKey = process.env.NEXT_PUBLIC_SUPABASE_ANON_KEY;
const dbEnv = envContents();
const supabaseUrl = dbEnv.SUPABASE_URL;
const supabaseKey = dbEnv.SUPABASE_ANON_KEY;

if (!supabaseUrl || !supabaseKey) {
throw new Error("Missing required Supabase environment variables");
Expand Down
8 changes: 5 additions & 3 deletions apps/website/app/utils/supabase/server.ts
Original file line number Diff line number Diff line change
@@ -1,13 +1,15 @@
import { createServerClient, type CookieOptions } from "@supabase/ssr";
import { cookies } from "next/headers";
import { Database } from "@repo/database/types.gen.ts";
import { Database } from "@repo/database/types.gen";
import { envContents } from "@repo/database/dbDotEnv";

// Inspired by https://supabase.com/ui/docs/nextjs/password-based-auth

export const createClient = async () => {
const dbEnv = envContents();
const cookieStore = await cookies();
const supabaseUrl = process.env.SUPABASE_URL;
const supabaseKey = process.env.SUPABASE_ANON_KEY;
const supabaseUrl = dbEnv.SUPABASE_URL;
const supabaseKey = dbEnv.SUPABASE_ANON_KEY;

if (!supabaseUrl || !supabaseKey) {
throw new Error("Missing required Supabase environment variables");
Expand Down
Loading