diff --git a/.gitignore b/.gitignore index 848e1d548..496bb2383 100644 --- a/.gitignore +++ b/.gitignore @@ -62,6 +62,7 @@ yarn-error.log* # env files (can opt-in for committing if needed) .env* +!.env.example # vercel .vercel @@ -72,4 +73,6 @@ next-env.d.ts *.rdb -packages/useautumn \ No newline at end of file +packages/useautumn + +shared/drizzle \ No newline at end of file diff --git a/commands.sh b/commands.sh index d4bbe8528..2f60ddb89 100644 --- a/commands.sh +++ b/commands.sh @@ -8,7 +8,7 @@ docker compose -f docker-compose.db.yml up --build docker compose -f docker-compose.dev.yml down docker volume rm main-repo_shared-node-modules main-repo_root-node-modules main-repo_vite-node-modules docker compose -f docker-compose.dev.yml build --no-cache -docker compose -f docker-compose.dev.yml up +docker compose -f docker-compose.dev.yml up --build # Prod docker compose -f docker-compose.prod.yml up --build diff --git a/drizzle.config.ts b/drizzle.config.ts index 6c2c3ee78..d47f0c2b1 100644 --- a/drizzle.config.ts +++ b/drizzle.config.ts @@ -1,4 +1,5 @@ -import "dotenv/config"; +import { config } from "dotenv"; +config({ path: "./server/.env" }); import { defineConfig } from "drizzle-kit"; export default defineConfig({ @@ -6,6 +7,6 @@ export default defineConfig({ out: "./drizzle", schema: "./db/schema.ts", dbCredentials: { - url: process.env.DEV_DATABASE_URL!, + url: process.env.DATABASE_URL!, }, }); diff --git a/package.json b/package.json index 6aa18568d..309e2d1af 100644 --- a/package.json +++ b/package.json @@ -15,5 +15,12 @@ "server:cron": "npm run cron:start -w server", "server:workers": "npm run workers:start -w server", "dev": "concurrently \"cd server && npm run dev\" \"cd vite && npm run dev\" \"redis-server\"" + }, + "dependencies": { + "drizzle-kit": "^0.31.1" + }, + "devDependencies": { + "@types/node": "^24.0.3", + "dotenv": "^16.5.0" } } diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 635ecaf4f..9b8436aa0 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -6,7 +6,18 @@ settings: importers: - .: {} + .: + dependencies: + drizzle-kit: + specifier: ^0.31.1 + version: 0.31.1 + devDependencies: + '@types/node': + specifier: ^24.0.3 + version: 24.0.3 + dotenv: + specifier: ^16.5.0 + version: 16.5.0 server: dependencies: @@ -2412,6 +2423,9 @@ packages: '@types/node@22.15.32': resolution: {integrity: sha512-3jigKqgSjsH6gYZv2nEsqdXfZqIFGAV36XYYjf9KGZ3PSG+IhLecqPnI310RvjutyMwifE2hhhNEklOUrvx/wA==} + '@types/node@24.0.3': + resolution: {integrity: sha512-R4I/kzCYAdRLzfiCabn9hxWfbuHS573x+r0dJMkkzThEa7pbrcDWK+9zu3e7aBOouf+rQAciqPFMnxwr0aWgKg==} + '@types/pg@8.15.4': resolution: {integrity: sha512-I6UNVBAoYbvuWkkU3oosC8yxqH21f4/Jc4DK71JLG3dT2mdlGe1z+ep/LQGXaKaOgcvUrsQoPRqfgtMcvZiJhg==} @@ -5299,6 +5313,9 @@ packages: undici-types@6.21.0: resolution: {integrity: sha512-iwDZqg0QAGrg9Rav5H4n0M64c3mkR59cJ6wQp+7C4nI0gsmExaedaYLNO44eT4AtBBwjbTiGPMlt2Md0T9H9JQ==} + undici-types@7.8.0: + resolution: {integrity: sha512-9UJ2xGDvQ43tYyVMpuHlsgApydB8ZKfVYTsLDhXkFL/6gfkp+U8xTGdh8pMJv1SpZna0zxG1DwsKZsreLbXBxw==} + unist-util-is@6.0.0: resolution: {integrity: sha512-2qCTHimwdxLfz+YzdGfkqNlH0tLi9xjTnHddPmJwtIG9MGsdbutfTc4P+haPD7l7Cjxf/WZj+we5qfVPvvxfYw==} @@ -7390,6 +7407,10 @@ snapshots: dependencies: undici-types: 6.21.0 + '@types/node@24.0.3': + dependencies: + undici-types: 7.8.0 + '@types/pg@8.15.4': dependencies: '@types/node': 22.15.32 @@ -10492,6 +10513,8 @@ snapshots: undici-types@6.21.0: {} + undici-types@7.8.0: {} + unist-util-is@6.0.0: dependencies: '@types/unist': 3.0.3 diff --git a/server/.env.example b/server/.env.example new file mode 100644 index 000000000..1ede252c1 --- /dev/null +++ b/server/.env.example @@ -0,0 +1,15 @@ +# AUTH +BETTER_AUTH_SECRET= +BETTER_AUTH_URL=http://localhost:8080 +CLIENT_URL=http://localhost:3000 + +# STRIPE REQUIRED +ENCRYPTION_IV= +ENCRYPTION_PASSWORD= +SERVER_URL= + +# DATABASE +DATABASE_URL= + +# IF using external redis +# REDIS_URL=redis://valkey:6379 \ No newline at end of file diff --git a/vite/.env.example b/vite/.env.example new file mode 100644 index 000000000..e1167733d --- /dev/null +++ b/vite/.env.example @@ -0,0 +1,2 @@ +VITE_FRONTEND_URL=http://localhost:3000 +VITE_BACKEND_URL=http://localhost:8080 \ No newline at end of file