Skip to content

Commit f7c8d66

Browse files
chore: migrate from env-cmd to dotenvx (#1987)
* chore: migrate from env-cmd to dotenvx - Replace env-cmd with dotenvx in package.json scripts - Update Taskfile.yaml to write to .env.supabase instead of merging - Consolidate .gitignore rules: add .env.* pattern with !.env.sample exception in root - Remove duplicate .env patterns from individual .gitignore files - Add @dotenvx/dotenvx to root devDependencies - Update documentation to reflect new dotenvx usage Co-Authored-By: yujonglee <[email protected]> * chore: update pnpm-lock.yaml with dotenvx dependency Co-Authored-By: yujonglee <[email protected]> --------- Co-authored-by: Devin AI <158243242+devin-ai-integration[bot]@users.noreply.github.com>
1 parent 08c5590 commit f7c8d66

File tree

15 files changed

+94
-75
lines changed

15 files changed

+94
-75
lines changed

.gitignore

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,9 @@ node_modules/
33
.DS_Store
44
.shuttle/
55
Secrets*.toml
6-
.env.local
7-
.env.prod
6+
.env
7+
.env.*
8+
!.env.sample
89
.venv
910
**/__pycache__/
1011
.supabase/

Taskfile.yaml

Lines changed: 1 addition & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -89,23 +89,7 @@ tasks:
8989
- '[ -n "$GITHUB_CLIENT_ID" ] && [ -n "$GITHUB_CLIENT_SECRET" ] && dasel put -f supabase/config.toml -t string -v '''' ''auth.external.github.redirect_uri'' || true'
9090
- dprint fmt supabase/config.toml
9191
- task: supabase-start:capture
92-
- task: env:merge
93-
vars:
94-
ENV_SOURCE: ".supabase/generated.env"
95-
ENV_TARGET: "apps/restate/.env"
96-
- task: env:merge
97-
vars:
98-
ENV_SOURCE: ".supabase/generated.env"
99-
ENV_TARGET: "apps/api/.env"
100-
- task: env:merge
101-
vars:
102-
ENV_SOURCE: ".supabase/generated.env"
103-
ENV_TARGET: "apps/web/.env"
104-
- task: env:merge
105-
vars:
106-
ENV_SOURCE: ".supabase/generated.env"
107-
ENV_TARGET: "apps/desktop/.env"
108-
- rm -f .supabase/generated.env
92+
- mv .supabase/generated.env .env.supabase
10993
- open http://127.0.0.1:54323
11094

11195
supabase-start:capture:

apps/api/.gitignore

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,2 @@
1-
.env
2-
.env.prod
3-
41
# Generated OpenAPI spec (build artifact)
52
openapi.yaml

apps/api/package.json

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"private": true,
44
"type": "module",
55
"scripts": {
6-
"dev": "env-cmd --silent -f ./.env -- bun --hot src/index.ts",
6+
"dev": "dotenvx run -f ../../.env.supabase -f .env -- bun --hot src/index.ts",
77
"typecheck": "tsc --noEmit"
88
},
99
"dependencies": {
@@ -20,7 +20,6 @@
2020
},
2121
"devDependencies": {
2222
"@types/bun": "^1.3.3",
23-
"env-cmd": "^11.0.0",
2423
"typescript": "^5.9.3"
2524
}
2625
}

apps/desktop/.gitignore

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,3 @@ dist-ssr
2222
*.njsproj
2323
*.sln
2424
*.sw?
25-
26-
.env
27-
.env.prod

apps/desktop/package.json

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,10 @@
77
"dev": "vite",
88
"build": "tsc && vite build",
99
"preview": "vite preview",
10-
"tauri": "env-cmd --silent -f ./.env -- tauri",
10+
"tauri": "dotenvx run -f ../../.env.supabase -f .env -- tauri",
1111
"typecheck": "tsc --noEmit",
1212
"test": "vitest run",
13-
"tauri:dev": "env-cmd --silent -f ./.env -- tauri dev",
13+
"tauri:dev": "dotenvx run -f ../../.env.supabase -f .env -- tauri dev",
1414
"tauri:build": "tauri build",
1515
"gen:schema": "tsx src/devtool/seed/script.ts"
1616
},
@@ -125,7 +125,6 @@
125125
"@types/stopword": "^2.0.3",
126126
"@vitejs/plugin-react": "^4.7.0",
127127
"autoprefixer": "^10.4.22",
128-
"env-cmd": "^11.0.0",
129128
"postcss": "^8.5.6",
130129
"stripe": "^19.3.1",
131130
"tailwindcss": "^3.4.18",

apps/pro/.gitignore

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,6 @@
1111
# deps
1212
node_modules/
1313

14-
# env
15-
.env
16-
.env.production
17-
1814
# logs
1915
logs/
2016
*.log

apps/restate/.gitignore

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
.env
1+

apps/restate/package.json

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
"type": "module",
55
"scripts": {
66
"build": "tsc --noEmitOnError",
7-
"dev": "env-cmd --silent -f ./.env -- wrangler dev --port 9080",
7+
"dev": "dotenvx run -f ../../.env.supabase -f .env -- wrangler dev --port 9080",
88
"start": "wrangler dev --port 9080",
99
"deploy": "wrangler deploy",
1010
"typecheck": "tsc --noEmit"
@@ -19,7 +19,6 @@
1919
"devDependencies": {
2020
"@cloudflare/workers-types": "^4.20240605.0",
2121
"@restatedev/restate": "^1.5.0",
22-
"env-cmd": "^11.0.0",
2322
"typescript": "^5.9.3",
2423
"wrangler": "^4.38.0"
2524
}

apps/web/.gitignore

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ node_modules
33
dist
44
dist-ssr
55
*.local
6-
.env
76
.nitro
87
.tanstack
98
.output

0 commit comments

Comments
 (0)