refactor: merge server/prisma/.env to server/.env

frouriojs · Dec 19, 2023 · 682542e · 682542e
1 parent cecd472
commit 682542e
Show file tree

Hide file tree

Showing 5 changed files with 4 additions and 7 deletions.
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -40,7 +40,5 @@ jobs:
       - run: npm run generate
       - run: npm run lint
       - run: npm run typecheck
-      - run: |
-          cp client/.env.example client/.env
-          cp server/prisma/.env.example server/prisma/.env
+      - run: cp client/.env.example client/.env
       - run: npm test
diff --git a/README.md b/README.md
@@ -28,7 +28,6 @@ $ npm i --prefix server
 $ cp client/.env.example client/.env
 $ cp server/.env.example server/.env
 $ cp docker/dev/.env.example docker/dev/.env
-$ cp server/prisma/.env.example server/prisma/.env
 ```
 
 ### ミドルウェアのセットアップ

diff --git a/server/.env.example b/server/.env.example
@@ -9,3 +9,5 @@ S3_BUCKET=app
 S3_ACCESS_KEY=minio
 S3_SECRET_KEY=password
 S3_REGION=ap-northeast-1
+API_DATABASE_URL=postgresql://root:root@localhost:5432/app
+TEST_DATABASE_URL=postgresql://root:root@localhost:5432/test
diff --git a/server/prisma/.env.example b/server/prisma/.env.example
diff --git a/server/vite.config.ts b/server/vite.config.ts
@@ -2,7 +2,7 @@ import dotenv from 'dotenv';
 import { defineConfig } from 'vite';
 import tsconfigPaths from 'vite-tsconfig-paths';
 
-dotenv.config({ path: './prisma/.env' });
+dotenv.config();
 
 export default defineConfig({
   define: { 'import.meta.vitest': false },