From 6aaaf5875cd3041cd6d911ce796b657f56ac357b Mon Sep 17 00:00:00 2001
From: David Cramer <dcramer@gmail.com>
Date: Tue, 9 May 2023 13:13:24 -0700
Subject: [PATCH] ref: Cleanup env vars to use nx

---
 .envrc                          |  2 +-
 .local.env                      |  2 ++
 apps/api/.env.test => .test.env |  1 -
 Procfile                        |  4 ++--
 apps/api/package.json           | 18 +++++++++---------
 package-lock.json               |  7 +++----
 package.json                    | 19 +++++++++----------
 7 files changed, 26 insertions(+), 27 deletions(-)
 create mode 100644 .local.env
 rename apps/api/.env.test => .test.env (88%)

diff --git a/.envrc b/.envrc
index 20f975df..477f5206 100644
--- a/.envrc
+++ b/.envrc
@@ -1,3 +1,3 @@
 layout node
 
-dotenv .env
+# dotenv .env
diff --git a/.local.env b/.local.env
new file mode 100644
index 00000000..724c42d1
--- /dev/null
+++ b/.local.env
@@ -0,0 +1,2 @@
+DATABASE_URL=postgresql://postgres:postgres@localhost:5432/peated
+JWT_SECRET=super-duper-s3cret
diff --git a/apps/api/.env.test b/.test.env
similarity index 88%
rename from apps/api/.env.test
rename to .test.env
index 6dc64ed3..28ddfcb6 100644
--- a/apps/api/.env.test
+++ b/.test.env
@@ -1,3 +1,2 @@
-NODE_ENV=test
 DATABASE_URL=postgresql://postgres:postgres@localhost:5432/test_peated
 JWT_SECRET=super-secret-test-secret
diff --git a/Procfile b/Procfile
index f77abda7..51e1de13 100644
--- a/Procfile
+++ b/Procfile
@@ -1,2 +1,2 @@
-web: npm run dev:web
-api: npm run dev:api
+web: nx dev web
+api: nx dev api
diff --git a/apps/api/package.json b/apps/api/package.json
index a3384600..b472c8ea 100644
--- a/apps/api/package.json
+++ b/apps/api/package.json
@@ -3,21 +3,21 @@
   "name": "api",
   "scripts": {
     "build": "tsc",
-    "dev": "nodemon --exec ts-node --require dotenv/config ./src/server.ts",
-    "dev:load-mocks": "ts-node --require dotenv/config ./src/bin/load-mocks.ts",
+    "dev": "nodemon --exec ts-node ./src/server.ts",
+    "dev:load-mocks": "ts-node ./src/bin/load-mocks.ts",
     "db:deploy": "npx prisma migrate deploy",
     "db:migrate": "run-s db:migrate:*",
     "db:migrate:dev": "npx prisma migrate dev",
-    "db:migrate:test": "dotenv -e .env.test -- npx prisma db push --accept-data-loss",
-    "generate-token": "ts-node --require dotenv/config ./src/bin/generate-token.ts",
-    "user:create": "ts-node --require dotenv/config ./src/bin/create-user.ts",
-    "user:admin": "ts-node --require dotenv/config ./src/bin/make-admin.ts",
-    "user:generate-token": "ts-node --require dotenv/config ./src/bin/generate-token.ts",
+    "db:migrate:test": "npx prisma db push --accept-data-loss",
+    "generate-token": "ts-node ./src/bin/generate-token.ts",
+    "user:create": "ts-node ./src/bin/create-user.ts",
+    "user:admin": "ts-node ./src/bin/make-admin.ts",
+    "user:generate-token": "ts-node ./src/bin/generate-token.ts",
     "postinstall": "npx prisma generate",
     "tsc": "tsc",
-    "start": "ts-node --require dotenv/config ./src/server.ts",
+    "start": "ts-node ./src/server.ts",
     "test": "run-s db:migrate:test test:vitest",
-    "test:vitest": "dotenv -e .env.test -- vitest --no-threads"
+    "test:vitest": "vitest --no-threads"
   },
   "dependencies": {
     "@faker-js/faker": "^7.6.0",
diff --git a/package-lock.json b/package-lock.json
index 18daf280..946c9652 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -17,11 +17,10 @@
         "@nx/node": "^16.1.1",
         "dotenv": "^16.0.3",
         "dotenv-cli": "^7.1.0",
-        "foreman": "^3.0.1",
-        "npm-run-all": "^4.1.5"
+        "foreman": "^3.0.1"
       },
-      "devDependencies": {
-        "nx": "^16.1.0"
+      "engines": {
+        "node": ">=18.0.0 <19.0.0"
       }
     },
     "apps/api": {
diff --git a/package.json b/package.json
index c10bcb5c..3e21971c 100644
--- a/package.json
+++ b/package.json
@@ -13,12 +13,12 @@
     "setup:deps": "npm install --workspaces --package-lock-only",
     "setup:db": "npm run db:migrate",
     "dev": "nf start",
-    "dev:web": "API_SERVER=http://localhost:4000 dotenv -e ./.env -- npm run dev -w apps/web",
-    "dev:api": "CORS_HOST=http://localhost:5173 PORT=4000 dotenv -e ./.env -- npm run dev -w apps/api",
-    "db:studio": "dotenv -e ./.env -- npx -w packages/api prisma studio",
-    "db:migrate": "dotenv -e ./.env -- npm run db:migrate -w apps/api",
-    "test:api": "dotenv -e ./.env -- npm run test -w apps/api",
-    "token": "dotenv -e ./.env -- npm run token -w apps/api"
+    "dev:web": "API_SERVER=http://localhost:4000 npm run dev -w apps/web",
+    "dev:api": "CORS_HOST=http://localhost:5173 PORT=4000 npm run dev -w apps/api",
+    "db:studio": "npx -w packages/api prisma studio",
+    "db:migrate": "npm run db:migrate -w apps/api",
+    "test:api": "npm run test -w apps/api",
+    "token": "npm run token -w apps/api"
   },
   "author": "David Cramer",
   "license": "Apache-2.0",
@@ -27,10 +27,9 @@
     "@nx/node": "^16.1.1",
     "dotenv": "^16.0.3",
     "dotenv-cli": "^7.1.0",
-    "foreman": "^3.0.1",
-    "npm-run-all": "^4.1.5"
+    "foreman": "^3.0.1"
   },
-  "devDependencies": {
-    "nx": "^16.1.0"
+  "engines": {
+    "node": ">=18.0.0 <19.0.0"
   }
 }